diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /target/arm | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/Makefile | 8 | ||||
| -rw-r--r-- | target/arm/kernel.config | 2 | ||||
| -rw-r--r-- | target/arm/sys-available/acmesystems-foxg20 | 1 | ||||
| -rw-r--r-- | target/arm/sys-available/qemu-arm | 1 | ||||
| -rw-r--r-- | target/arm/sys-available/raspberry-pi | 2 | ||||
| -rw-r--r-- | target/arm/sys-available/sharp-zaurus | 1 | ||||
| -rw-r--r-- | target/arm/uclibc.config.big | 2 | ||||
| -rw-r--r-- | target/arm/uclibc.config.little | 2 |
8 files changed, 9 insertions, 10 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/kernel.config b/target/arm/kernel.config index d71d50b3e..7a4266c04 100644 --- a/target/arm/kernel.config +++ b/target/arm/kernel.config @@ -331,7 +331,7 @@ CONFIG_ATAGS=y CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 # CONFIG_ARM_APPENDED_DTB is not set -CONFIG_CMDLINE="console=tty0" +CONFIG_CMDLINE="" # CONFIG_CMDLINE_FROM_BOOTLOADER is not set CONFIG_CMDLINE_EXTEND=y # CONFIG_CMDLINE_FORCE is not set diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20 index 3ee53f072..8ea196d97 100644 --- a/target/arm/sys-available/acmesystems-foxg20 +++ b/target/arm/sys-available/acmesystems-foxg20 @@ -14,6 +14,7 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 select ADK_TARGET_WITH_MMC select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_USB + select ADK_TARGET_KERNEL_IMAGE help Acme Systems Foxboard FOXG20 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 846f0fcf8..9d743ed18 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -15,7 +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_KERNEL_SWAP + 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/arm/uclibc.config.big b/target/arm/uclibc.config.big index 51293a19b..6dacd4833 100644 --- a/target/arm/uclibc.config.big +++ b/target/arm/uclibc.config.big @@ -210,7 +210,7 @@ UCLIBC_HAS_FNMATCH=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_NFTW=y UCLIBC_HAS_FTW=y -# UCLIBC_HAS_FTS is not set +UCLIBC_HAS_FTS=y UCLIBC_HAS_GLOB=y UCLIBC_HAS_GNU_GLOB=y # UCLIBC_HAS_UTMPX is not set diff --git a/target/arm/uclibc.config.little b/target/arm/uclibc.config.little index c388f5696..851ac0c06 100644 --- a/target/arm/uclibc.config.little +++ b/target/arm/uclibc.config.little @@ -210,7 +210,7 @@ UCLIBC_HAS_FNMATCH=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_NFTW=y UCLIBC_HAS_FTW=y -# UCLIBC_HAS_FTS is not set +UCLIBC_HAS_FTS=y UCLIBC_HAS_GLOB=y UCLIBC_HAS_GNU_GLOB=y # UCLIBC_HAS_UTMPX is not set |