diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-10 17:30:16 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-10 17:30:16 +0100 |
| commit | 92c6800911697db6175731494f3e118dbad3b38a (patch) | |
| tree | 68a56029223e167fc37d0fa37e5bd6702f64efd9 /target | |
| parent | 5c53c898d354eded2834e43550d299cb1c58ec58 (diff) | |
| parent | 22684e6dee0f4ec612b6913b1cbdd0abee60c66b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/Makefile | 8 | ||||
| -rw-r--r-- | target/arm/sys-available/qemu-arm | 1 | ||||
| -rw-r--r-- | target/arm/sys-available/raspberry-pi | 1 | ||||
| -rw-r--r-- | target/arm/sys-available/sharp-zaurus | 1 | ||||
| -rw-r--r-- | target/config/Config.in | 4 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 1 |
6 files changed, 10 insertions, 6 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 0007e8a36..6dc9cd306 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -7,14 +7,10 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) -KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage -else ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) -KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage -else ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) +ifeq ($(ADK_TARGET_KERNEL_ZIMAGE),y) KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage else -KERNEL:=$(LINUX_DIR)/vmlinux +KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) endif LOADADDR:=0x20008000 diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm index 1e62f2abb..141e80d25 100644 --- a/target/arm/sys-available/qemu-arm +++ b/target/arm/sys-available/qemu-arm @@ -6,5 +6,6 @@ config ADK_TARGET_SYSTEM_QEMU_ARM select ADK_EABI select ADK_TARGET_NO_FPU select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_ZIMAGE help Support for Qemu Emulator (arm). diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index b8753c36d..9d743ed18 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -15,6 +15,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_INPUT select ADK_PACKAGE_BCM2835_FIRMWARE select ADK_PACKAGE_BCM2835_VC + select ADK_TARGET_KERNEL_ZIMAGE help Raspberry PI diff --git a/target/arm/sys-available/sharp-zaurus b/target/arm/sys-available/sharp-zaurus index f236cb350..848dfdbd1 100644 --- a/target/arm/sys-available/sharp-zaurus +++ b/target/arm/sys-available/sharp-zaurus @@ -17,5 +17,6 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS select ADK_KERNEL_MACH_SPITZ select ADK_KERNEL_PXA_SHARP_Cxx00 select ADK_KERNEL_SPI_PXA2XX + select ADK_TARGET_KERNEL_ZIMAGE help Support for Sharp Zaurus CL3200 (Terrier) diff --git a/target/config/Config.in b/target/config/Config.in index a2495cdd9..dd80fb9cf 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -4,11 +4,15 @@ config ADK_TARGET_KERNEL_VMLINUZ boolean +config ADK_TARGET_KERNEL_ZIMAGE + boolean + config ADK_TARGET_KERNEL_BZIMAGE boolean config ADK_TARGET_KERNEL string + default "zImage" if ADK_TARGET_KERNEL_ZIMAGE default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE default "vmlinux" diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 4532d4442..51b2dde0c 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -22,6 +22,7 @@ config ADK_RUNTIME_PASSWORD config ADK_RUNTIME_TMPFS_SIZE string "size of /tmp in memory (kB)" + default "16384" if ADK_HARDWARE_QEMU default "32768" if ADK_TARGET_SYSTEM_IBM_X40 default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "2048" |