diff options
| author | Simon Glass <sjg@chromium.org> | 2021-03-15 18:11:24 +1300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-03-27 15:04:31 +1300 |
| commit | c119528a1dd0ac719040d234c0a368a0ebaeb745 (patch) | |
| tree | 2c561533e64b9cce32799cdc735e8b0372230601 | |
| parent | a8d696275aca9a121d438db50fcc44c02d7793cb (diff) | |
| download | u-boot-c119528a1dd0ac719040d234c0a368a0ebaeb745.zip u-boot-c119528a1dd0ac719040d234c0a368a0ebaeb745.tar.gz u-boot-c119528a1dd0ac719040d234c0a368a0ebaeb745.tar.bz2 | |
sandbox: Correct uninit conflict
It is not possible to remove the state before driver model is uninited,
since the devices are allocated in the memory buffer. Also it is not
possible to uninit driver model afterwards, since the RAM has been
freed.
Drop the uninit altogether, since it is not actually necessary.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/sandbox/cpu/cpu.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index edd48e2..48636ab 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -6,7 +6,6 @@ #include <common.h> #include <bootstage.h> #include <cpu_func.h> -#include <dm.h> #include <errno.h> #include <log.h> #include <asm/global_data.h> @@ -17,7 +16,6 @@ #include <asm/malloc.h> #include <asm/setjmp.h> #include <asm/state.h> -#include <dm/root.h> DECLARE_GLOBAL_DATA_PTR; @@ -34,10 +32,8 @@ void sandbox_exit(void) { /* Do this here while it still has an effect */ os_fd_restore(); - if (state_uninit()) - os_exit(2); - if (dm_uninit()) + if (state_uninit()) os_exit(2); /* This is considered normal termination for now */ |