diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-11-25 12:04:41 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-11-25 12:04:41 +0100 |
| commit | 49a4c7476f5f7c67dc8159537d9fbcdcfa91afb8 (patch) | |
| tree | 6a365f9f840b57ab3ccea7b8b31b6e7e97d48248 /lib_arm/bootm.c | |
| parent | 06efc122a0dc47e704aa6c8e266d2663fee3977b (diff) | |
| parent | e23c7c95a96eb0f068efe5c532215a10a1512a95 (diff) | |
| download | u-boot-imx-49a4c7476f5f7c67dc8159537d9fbcdcfa91afb8.zip u-boot-imx-49a4c7476f5f7c67dc8159537d9fbcdcfa91afb8.tar.gz u-boot-imx-49a4c7476f5f7c67dc8159537d9fbcdcfa91afb8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'lib_arm/bootm.c')
| -rw-r--r-- | lib_arm/bootm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c index 8e264ce..7dbde7d 100644 --- a/lib_arm/bootm.c +++ b/lib_arm/bootm.c @@ -67,7 +67,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) char *commandline = getenv ("bootargs"); #endif - if ((flag != 0) || (flag != BOOTM_STATE_OS_GO)) + if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; theKernel = (void (*)(int, int, uint))images->ep; |