diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:22:53 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:22:53 +0100 |
| commit | 34592482701199604242848b80c39bd07b6c7716 (patch) | |
| tree | 20005f94a48d069c3cfd115b1325cb44f92334fb /target | |
| parent | dfadb4d959da4c63d0c634f0d50713f3fa679e50 (diff) | |
| parent | d9a3994a44d79ed167f41db09edd0dae41566b55 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in | 3 | ||||
| -rw-r--r-- | target/tools/mkfimage/Makefile | 2 | ||||
| -rwxr-xr-x | target/tools/mkfimage/mkfimage | bin | 11901 -> 0 bytes | |||
| -rw-r--r-- | target/tools/trx/Makefile | 2 | ||||
| -rw-r--r-- | target/tools/uboot-mkimage/Makefile | 4 | ||||
| -rw-r--r-- | target/x86/sys-available/pcengines-alix1c | 4 |
6 files changed, 9 insertions, 6 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 0cc86d250..32884f778 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -167,7 +167,7 @@ config ADK_TARGET_CFLAGS config ADK_TARGET_CMDLINE string default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP - default "console=ttyS0,115200 console=tty0 irqpoll geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 default "console=ttyS0,115200" @@ -329,6 +329,7 @@ config ADK_TARGET_ROOTFS_USB select ADK_KERNEL_BLK_DEV_SD select ADK_KERNEL_USB select ADK_KERNEL_USB_EHCI_HCD + select ADK_KERNEL_USB_OHCI_HCD select ADK_KERNEL_USB_UHCI_HCD select ADK_KERNEL_USB_STORAGE select ADK_KERNEL_EXT2_FS diff --git a/target/tools/mkfimage/Makefile b/target/tools/mkfimage/Makefile index 110fa96ea..82e645285 100644 --- a/target/tools/mkfimage/Makefile +++ b/target/tools/mkfimage/Makefile @@ -1,4 +1,4 @@ include $(TOPDIR)/rules.mk all: - $(HOSTCC) -o ${STAGING_HOST_DIR}/bin/mkfimage mkfimage.c + $(HOSTCC) ${HOSTCFLAGS} -o ${STAGING_HOST_DIR}/bin/mkfimage mkfimage.c diff --git a/target/tools/mkfimage/mkfimage b/target/tools/mkfimage/mkfimage Binary files differdeleted file mode 100755 index b4f82ee6d..000000000 --- a/target/tools/mkfimage/mkfimage +++ /dev/null diff --git a/target/tools/trx/Makefile b/target/tools/trx/Makefile index 8daf54e78..2def53424 100644 --- a/target/tools/trx/Makefile +++ b/target/tools/trx/Makefile @@ -1,4 +1,4 @@ include $(TOPDIR)/rules.mk all: - $(HOSTCC) -o ${STAGING_HOST_DIR}/bin/trx trx.c + $(HOSTCC) ${HOSTCFLAGS} -o ${STAGING_HOST_DIR}/bin/trx trx.c diff --git a/target/tools/uboot-mkimage/Makefile b/target/tools/uboot-mkimage/Makefile index 08506a5f8..c9d85a28e 100644 --- a/target/tools/uboot-mkimage/Makefile +++ b/target/tools/uboot-mkimage/Makefile @@ -1,6 +1,4 @@ include $(TOPDIR)/rules.mk all: - $(HOSTCC) -c crc32.c -o crc32.o - $(HOSTCC) -c mkimage.c -o mkimage.o - $(HOSTCC) -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.o crc32.o + $(HOSTCC) ${HOSTCFLAGS} -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.c crc32.c diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c index 77802ea4d..4024ecb90 100644 --- a/target/x86/sys-available/pcengines-alix1c +++ b/target/x86/sys-available/pcengines-alix1c @@ -4,6 +4,8 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C select ADK_pcengines_alix1c select ADK_CPU_GEODE select ADK_KERNEL_MGEODE_LX + select ADK_KERNEL_PM + select ADK_KERNEL_ACPI select ADK_TARGET_CPU_WITH_3DNOW select ADK_TARGET_CPU_WITH_3DNOWEXT select ADK_TARGET_CPU_WITH_MMX @@ -16,6 +18,8 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_CF + select ADK_TARGET_WITH_WATCHDOG + select ADK_TARGET_WITH_USB_BOOT help System profile for PCEngines ALIX1C. |