diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-15 09:51:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-04 07:44:26 +0200 |
| commit | 79e3038089f5392a86c688b0fedf7523a99b8d51 (patch) | |
| tree | 3e6d0b7fdae1678ada77387aa99a47e6e17807cd | |
| parent | d5e19a7ea2a9cdb156677ce957183a8c8b5a2fe5 (diff) | |
| download | barebox-79e3038089f5392a86c688b0fedf7523a99b8d51.tar.gz barebox-79e3038089f5392a86c688b0fedf7523a99b8d51.tar.xz | |
ARM: aarch64: disable 32bit boot commands
The 32bit boot support is full of legacy cruft. While it should be
possible to merge the aarch64 support there, a fresh start looks more
promising.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/lib32/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/lib32/bootm.c (renamed from arch/arm/lib/bootm.c) | 0 | ||||
| -rw-r--r-- | arch/arm/lib32/bootu.c (renamed from arch/arm/lib/bootu.c) | 0 | ||||
| -rw-r--r-- | commands/Kconfig | 4 |
5 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index cf84a9a1c1..ac97de1e83 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -298,7 +298,6 @@ endif common-y += $(BOARD) arch/arm/boards/ $(MACH) common-y += arch/arm/cpu/ -common-y += arch/arm/lib/ ifeq ($(CONFIG_CPU_V8), y) common-y += arch/arm/lib64/ diff --git a/arch/arm/lib32/Makefile b/arch/arm/lib32/Makefile index cdd07322cf..3c02a0bf96 100644 --- a/arch/arm/lib32/Makefile +++ b/arch/arm/lib32/Makefile @@ -1,5 +1,7 @@ obj-$(CONFIG_ARM_LINUX) += armlinux.o obj-$(CONFIG_CMD_BOOTZ) += bootz.o +obj-$(CONFIG_BOOTM) += bootm.o +obj-$(CONFIG_CMD_BOOTU) += bootu.o obj-y += div0.o obj-y += findbit.o obj-y += io.o diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib32/bootm.c index c8bf72f0e0..c8bf72f0e0 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib32/bootm.c diff --git a/arch/arm/lib/bootu.c b/arch/arm/lib32/bootu.c index d811da39ce..d811da39ce 100644 --- a/arch/arm/lib/bootu.c +++ b/arch/arm/lib32/bootu.c diff --git a/commands/Kconfig b/commands/Kconfig index 17bbe0f27a..951a86963e 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -348,7 +348,7 @@ config CMD_BOOTM config CMD_BOOTU tristate default y - depends on ARM + depends on ARM && !CPU_64v8 prompt "bootu" help Boot into already loaded Linux kernel, which must be raw (uncompressed). @@ -357,7 +357,7 @@ config CMD_BOOTU config CMD_BOOTZ tristate - depends on ARM + depends on ARM && !CPU_64v8 prompt "bootz" help Boot Linux zImage |