From c659b13a2fc07188f716327364f6080e9486f3de Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Sat, 29 Mar 2008 23:09:46 +0000 Subject: [PATCH] Remove duplicate AVR32 patches, and add support for ARCH and conditional AVR32 patches --- target/Makefile.in | 2 + target/device/Atmel/Config.in.linux.patches | 6 + target/device/Atmel/Makefile.in | 6 - target/device/Atmel/Makefile.in.linux | 3 + .../Atmel/arch-arm/Config.in.linux.patches | 58 + target/device/Atmel/arch-arm/Makefile.in | 12 + target/device/Atmel/arch-arm/arch-arm.mk | 4 + .../Atmel/arch-avr32/Config.in.linux.patches | 79 + target/device/Atmel/arch-avr32/arch-avr32.mk | 27 + .../linux-2.6.23-100-avr32-atmel.2.patch | 0 ...-fix-include-typo-for-atngw100-board.patch | 0 .../linux-2.6.24-100-avr32-git.1.patch | 0 ...linux-2.6.24-500-v4l-avr32-isi.patch.cond} | 0 .../linux-2.6.24-600-avr32-mmc.patch | 0 .../linux-2.6.24-avr32-ac97-reset.patch.cond} | 0 .../linux-2.6.24-avr32-psif-2.patch.cond} | 0 .../at91sam9260dfc/at91sam9260dfc_defconfig | 314 +- .../linux-2.6.23-100-avr32-atmel.2.patch | 19857 ---------------- ...-fix-include-typo-for-atngw100-board.patch | 11 - .../linux-2.6.24-100-avr32-git.1.patch | 16922 ------------- .../linux-2.6.24-600-avr32-mmc.patch | 255 - .../device/Atmel/atngw100/atngw100_defconfig | 76 +- .../linux-2.6.23-100-avr32-atmel.2.patch | 19857 ---------------- ...-fix-include-typo-for-atngw100-board.patch | 11 - .../linux-2.6.24-100-avr32-git.1.patch | 16922 ------------- .../linux-2.6.24-600-avr32-mmc.patch | 255 - .../Atmel/atstk1002/atstk1002_defconfig | 197 +- .../linux-2.6.23-100-avr32-atmel.2.patch | 19857 ---------------- .../linux-2.6.24-100-avr32-git.1.patch | 16922 ------------- .../linux-2.6.24-600-avr32-mmc.patch | 255 - target/device/Config.in.linux.patches | 14 + target/device/Makefile.in.linux | 1 + target/linux/Config.in.advanced | 56 +- target/linux/Makefile.in.advanced | 24 +- 34 files changed, 618 insertions(+), 111385 deletions(-) create mode 100644 target/device/Atmel/Config.in.linux.patches create mode 100644 target/device/Atmel/Makefile.in.linux create mode 100644 target/device/Atmel/arch-arm/Config.in.linux.patches create mode 100644 target/device/Atmel/arch-arm/Makefile.in create mode 100644 target/device/Atmel/arch-arm/arch-arm.mk create mode 100644 target/device/Atmel/arch-avr32/Config.in.linux.patches create mode 100644 target/device/Atmel/arch-avr32/arch-avr32.mk rename target/device/Atmel/{atngw100-base/kernel-patches => arch-avr32/kernel-patches-2.6.23}/linux-2.6.23-100-avr32-atmel.2.patch (100%) rename target/device/Atmel/{atngw100-base/kernel-patches => arch-avr32/kernel-patches-2.6.23}/linux-2.6.23-200-fix-include-typo-for-atngw100-board.patch (100%) rename target/device/Atmel/{atngw100-base/kernel-patches => arch-avr32/kernel-patches-2.6.24}/linux-2.6.24-100-avr32-git.1.patch (100%) rename target/device/Atmel/{misc-patches/linux-2.6.24-500-v4l-avr32-isi.patch => arch-avr32/kernel-patches-2.6.24/linux-2.6.24-500-v4l-avr32-isi.patch.cond} (100%) rename target/device/Atmel/{atngw100-base/kernel-patches => arch-avr32/kernel-patches-2.6.24}/linux-2.6.24-600-avr32-mmc.patch (100%) rename target/device/Atmel/{misc-patches/linux-2.6.24-avr32-ac97-reset.patch => arch-avr32/kernel-patches-2.6.24/linux-2.6.24-avr32-ac97-reset.patch.cond} (100%) rename target/device/Atmel/{misc-patches/linux-2.6.24-avr32-psif-2.patch => arch-avr32/kernel-patches-2.6.24/linux-2.6.24-avr32-psif-2.patch.cond} (100%) delete mode 100644 target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.23-100-avr32-atmel.2.patch delete mode 100644 target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.23-200-fix-include-typo-for-atngw100-board.patch delete mode 100644 target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24-100-avr32-git.1.patch delete mode 100644 target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.24-600-avr32-mmc.patch delete mode 100644 target/device/Atmel/atngw100/kernel-patches/linux-2.6.23-100-avr32-atmel.2.patch delete mode 100644 target/device/Atmel/atngw100/kernel-patches/linux-2.6.23-200-fix-include-typo-for-atngw100-board.patch delete mode 100644 target/device/Atmel/atngw100/kernel-patches/linux-2.6.24-100-avr32-git.1.patch delete mode 100644 target/device/Atmel/atngw100/kernel-patches/linux-2.6.24-600-avr32-mmc.patch delete mode 100644 target/device/Atmel/atstk1002/kernel-patches/linux-2.6.23-100-avr32-atmel.2.patch delete mode 100644 target/device/Atmel/atstk1002/kernel-patches/linux-2.6.24-100-avr32-git.1.patch delete mode 100644 target/device/Atmel/atstk1002/kernel-patches/linux-2.6.24-600-avr32-mmc.patch create mode 100644 target/device/Config.in.linux.patches create mode 100644 target/device/Makefile.in.linux diff --git a/target/Makefile.in b/target/Makefile.in index 8283aa4845..1875032602 100644 --- a/target/Makefile.in +++ b/target/Makefile.in @@ -32,4 +32,6 @@ ifeq ($(strip $(subst ",,$(BR2_KERNEL_LINUX_ADVANCED))),y) include target/linux/Makefile.in.advanced endif +include target/device/Makefile.in.linux + include target/hurd/Makefile.in diff --git a/target/device/Atmel/Config.in.linux.patches b/target/device/Atmel/Config.in.linux.patches new file mode 100644 index 0000000000..3812776772 --- /dev/null +++ b/target/device/Atmel/Config.in.linux.patches @@ -0,0 +1,6 @@ +if BR2_arm +source "target/device/Atmel/arch-arm/Config.in.linux.patches" +endif +if BR2_avr32 +source "target/device/Atmel/arch-avr32/Config.in.linux.patches" +endif diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index 63a3af33b3..6a998d0df1 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -30,8 +30,6 @@ endif LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) #")) -LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) -#")) # These are set by "new" Config.in LINUX26_KCONFIG:=$(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config @@ -65,10 +63,6 @@ include target/device/Atmel/*/Makefile.in UBOOT_CONFIG:=$(UBOOT_BOARD_NAME)_config UBOOT_CONFIG_FILE:=$(BOARD_PATH)/u-boot/$(UBOOT_BOARD_NAME).h -ifeq ($(strip $(BR2_PACKAGE_LINUX)),y) -#include $(ATMEL_PATH)/Linux/linux.mk -endif - ifeq ($(strip $(BR2_TARGET_UBOOT_AT91)),y) include $(ATMEL_PATH)/u-boot/u-boot.mk endif diff --git a/target/device/Atmel/Makefile.in.linux b/target/device/Atmel/Makefile.in.linux new file mode 100644 index 0000000000..b529a9b272 --- /dev/null +++ b/target/device/Atmel/Makefile.in.linux @@ -0,0 +1,3 @@ +include target/device/Atmel/arch-arm/arch-arm.mk +include target/device/Atmel/arch-avr32/arch-avr32.mk + diff --git a/target/device/Atmel/arch-arm/Config.in.linux.patches b/target/device/Atmel/arch-arm/Config.in.linux.patches new file mode 100644 index 0000000000..48f754539b --- /dev/null +++ b/target/device/Atmel/arch-arm/Config.in.linux.patches @@ -0,0 +1,58 @@ +choice + prompt "Add AT91 specific patches" + depends on BR2_KERNEL_ARCH_PATCH_ENABLED + depends on BR2_TARGET_ATMEL && BR2_arm + default BR2_ARCH_AT91_2_6_24 if BR2_LINUX_2_6_24 + default BR2_ARCH_AT91_2_6_24 if BR2_LINUX_2_6_23 + default BR2_ARCH_AT91_2_6_22_1 if BR2_LINUX_2_6_22_1 + default BR2_ARCH_AT91_2_6_21_5 if BR2_LINUX_2_6_21 || BR2_LINUX_2_6_21_5 + default BR2_ARCH_AT91_2_6_21_1 if BR2_LINUX_2_6_21_1 + default BR2_ARCH_AT91_2_6_20_4 if BR2_LINUX_2_6_20 || BR2_LINUX_2_6_20_4 + default BR2_ARCH_AT91_2_6_24 + help + Select a patch to add to the Linux kernel + +config BR2_ARCH_AT91_2_6_24 + bool "2.6.24" + help + Apply the at91 linux-2.6.24 patches" + +config BR2_ARCH_AT91_2_6_22_1 + bool "2.6.22.1" + help + Apply the at91 linux-2.6.22.1 patches" + +config BR2_ARCH_AT91_2_6_21_5 + bool "2.6.21.5" + help + Apply the at91 linux-2.6.21.5 patches" + +config BR2_ARCH_AT91_2_6_21_1 + bool "2.6.21.1" + help + Apply the at91 linux-2.6.21.1 patches" + +config BR2_ARCH_AT91_2_6_20_4 + bool "2.6.20.4" + help + Apply the at91 linux-2.6.20.4 patches" + +endchoice + +config BR2_KERNEL_ARCH_PATCH_VERSION + string + depends on BR2_KERNEL_ARCH_PATCH_ENABLED + depends on BR2_TARGET_ATMEL && BR2_arm + default "2.6.24" if BR2_ARCH_AT91_2_6_24 + default "2.6.22.1" if BR2_ARCH_AT91_2_6_22_1 + default "2.6.21.5" if BR2_ARCH_AT91_2_6_21_5 + default "2.6.21.1" if BR2_ARCH_AT91_2_6_21_1 + default "2.6.20.4" if BR2_ARCH_AT91_2_6_20_4 + +config BR2_KERNEL_ARCH_PATCH_DIR + string + default "target/device/Atmel/arch-arm/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)" + + + + diff --git a/target/device/Atmel/arch-arm/Makefile.in b/target/device/Atmel/arch-arm/Makefile.in new file mode 100644 index 0000000000..1db111e9bf --- /dev/null +++ b/target/device/Atmel/arch-arm/Makefile.in @@ -0,0 +1,12 @@ +ifeq ($(BR2_avr32),y) +KERNEL_COND_PATCHES:= +ifeq ($(BR2_LINUX_AVR32_AC97_PATCH),y) +KERNEL_COND_PATCHES+=avr32.patched.ac97 +endif +ifeq ($(BR2_LINUX_AVR32_ISI_PATCH),y) +KERNEL_COND_PATCHES+=avr32.patched.isi +endif +ifeq ($(BR2_LINUX_AVR32_PSIF_PATCH),y) +KERNEL_COND_PATCHES+=avr32.patched.psif +endif +endif diff --git a/target/device/Atmel/arch-arm/arch-arm.mk b/target/device/Atmel/arch-arm/arch-arm.mk new file mode 100644 index 0000000000..49af525101 --- /dev/null +++ b/target/device/Atmel/arch-arm/arch-arm.mk @@ -0,0 +1,4 @@ +ifeq ($(BR2_arm),y) + +endif + diff --git a/target/device/Atmel/arch-avr32/Config.in.linux.patches b/target/device/Atmel/arch-avr32/Config.in.linux.patches new file mode 100644 index 0000000000..e6e3396c66 --- /dev/null +++ b/target/device/Atmel/arch-avr32/Config.in.linux.patches @@ -0,0 +1,79 @@ +choice + prompt "Add AVR32 specific patches" + depends on BR2_KERNEL_ARCH_PATCH_ENABLED + depends on BR2_avr32 + default BR2_ARCH_AVR32_2_6_24 if BR2_LINUX_2_6_24 + default BR2_ARCH_AVR32_2_6_23 if BR2_LINUX_2_6_23 + default BR2_ARCH_AVR32_2_6_22_10 if BR2_LINUX_2_6_22 || BR2_LINUX_2_6_22_10 + default BR2_ARCH_AVR32_2_6_22_1 if BR2_LINUX_2_6_22_1 + default BR2_ARCH_AVR32_2_6_21_5 if BR2_LINUX_2_6_21 || BR2_LINUX_2_6_21_5 + default BR2_ARCH_AVR32_2_6_20_4 if BR2_LINUX_2_6_20 || BR2_LINUX_2_6_20_4 + default BR2_ARCH_AVR32_2_6_24 + help + Select a patch to add to the Linux kernel + +config BR2_ARCH_AVR32_2_6_24 + bool "2.6.24" + help + Apply the avr32 linux-2.6.24 patches" + +config BR2_ARCH_AVR32_2_6_23 + bool "2.6.23" + help + Apply the avr32 linux-2.6.23 patches" + +config BR2_ARCH_AVR32_2_6_22_10 + bool "2.6.22.10" + help + Apply the avr32 linux-2.6.22.10 patches" + +config BR2_ARCH_AVR32_2_6_22_1 + bool "2.6.22.1" + help + Apply the avr32 linux-2.6.22.1 patches" + +config BR2_ARCH_AVR32_2_6_21_5 + bool "2.6.21.5" + help + Apply the avr32 linux-2.6.21.5 patches" + +config BR2_ARCH_AVR32_2_6_20_4 + bool "2.6.20.4" + help + Apply the avr32 linux-2.6.20.4 patches" + +endchoice + +config BR2_KERNEL_ARCH_PATCH_VERSION + string + depends on BR2_KERNEL_ARCH_PATCH_ENABLED + depends on BR2_avr32 + default "2.6.24" if BR2_ARCH_AVR32_2_6_24 + default "2.6.22.10" if BR2_ARCH_AVR32_2_6_22_10 + default "2.6.22.1" if BR2_ARCH_AVR32_2_6_22_1 + default "2.6.21.5" if BR2_ARCH_AVR32_2_6_21_5 + default "2.6.20.4" if BR2_ARCH_AVR32_2_6_20_4 + +config BR2_KERNEL_ARCH_PATCH_DIR + string + default "target/device/Atmel/arch-avr32/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)" + +config BR2_LINUX_AVR32_ISI_PATCH + bool "Add ISI patch" + default n + help + Add support for the Image Sensor Interface + +config BR2_LINUX_AVR32_AC97_PATCH + bool "Add AC97 patch" + default n + help + Add support for AC97. + Will need to be patched further to change GPIO_PIN_NONE + to the real pin used as AC-97 reset pin. + +config BR2_LINUX_AVR32_PSIF_PATCH + bool "Add PSIF patch" + default n + help + Add support for the PS/2 Interface diff --git a/target/device/Atmel/arch-avr32/arch-avr32.mk b/target/device/Atmel/arch-avr32/arch-avr32.mk new file mode 100644 index 0000000000..9fb888622c --- /dev/null +++ b/target/device/Atmel/arch-avr32/arch-avr32.mk @@ -0,0 +1,27 @@ +ifeq ($(BR2_avr32),y) + +avr32.patched.ac97: $(LINUX26_DIR)/.patched.ac97 + @echo avr32.patched.ac97 + +avr32.patched.isi: $(LINUX26_DIR)/.patched.isi + @echo avr32.patched.isi + +avr32.patched.psif: $(LINUX26_DIR)/.patched.psif + @echo avr32.patched.psif + + +$(LINUX26_DIR)/.patched.isi: $(LINUX26_DIR)/.patched.arch + toolchain/patch-kernel.sh $(LINUX26_DIR) $(BR2_KERNEL_ARCH_PATCH_DIR) \ + linux-*-500-v4l-avr32-isi.patch.cond + touch $@ + +$(LINUX26_DIR)/.patched.ac97: $(LINUX26_DIR)/.patched.arch + toolchain/patch-kernel.sh $(LINUX26_DIR) $(BR2_KERNEL_ARCH_PATCH_DIR) \ + linux-*-avr32-ac97-reset.patch.cond + touch $@ + +$(LINUX26_DIR)/.patched.psif: $(LINUX26_DIR)/.patched.arch + toolchain/patch-kernel.sh $(LINUX26_DIR) $(BR2_KERNEL_ARCH_PATCH_DIR) \ + linux-*-avr32-psif-2.patch.cond + touch $@ +endif diff --git a/target/device/Atmel/atngw100-base/kernel-patches/linux-2.6.23-100-avr32-atmel.2.patch b/target/device/Atmel/arch-avr32/kernel-patches-2.6.23/linux-2.6.23-100-avr32-atmel.2.patch similarity index 100% rename from target/device/Atmel/atngw100-base/kernel-patches/linux-2.6.23-100-avr32-atmel.2.patch rename to target/device/Atmel/arch-avr32/kernel-patches-2.6.23/linux-2.6.23-100-avr32-atmel.2.patch diff --git a/target/device/Atmel/atngw100-base/kernel-patches/linux-2.6.23-200-fix-include-typo-for-atngw100-board.patch b/target/device/Atmel/arch-avr32/kernel-patches-2.6.23/linux-2.6.23-200-fix-include-typo-for-atngw100-board.patch similarity index 100% rename from target/device/Atmel/atngw100-base/kernel-patches/linux-2.6.23-200-fix-include-typo-for-atngw100-board.patch rename to target/device/Atmel/arch-avr32/kernel-patches-2.6.23/linux-2.6.23-200-fix-include-typo-for-atngw100-board.patch diff --git a/target/device/Atmel/atngw100-base/kernel-patches/linux-2.6.24-100-avr32-git.1.patch b/target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-100-avr32-git.1.patch similarity index 100% rename from target/device/Atmel/atngw100-base/kernel-patches/linux-2.6.24-100-avr32-git.1.patch rename to target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-100-avr32-git.1.patch diff --git a/target/device/Atmel/misc-patches/linux-2.6.24-500-v4l-avr32-isi.patch b/target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-500-v4l-avr32-isi.patch.cond similarity index 100% rename from target/device/Atmel/misc-patches/linux-2.6.24-500-v4l-avr32-isi.patch rename to target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-500-v4l-avr32-isi.patch.cond diff --git a/target/device/Atmel/atngw100-base/kernel-patches/linux-2.6.24-600-avr32-mmc.patch b/target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-600-avr32-mmc.patch similarity index 100% rename from target/device/Atmel/atngw100-base/kernel-patches/linux-2.6.24-600-avr32-mmc.patch rename to target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-600-avr32-mmc.patch diff --git a/target/device/Atmel/misc-patches/linux-2.6.24-avr32-ac97-reset.patch b/target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-avr32-ac97-reset.patch.cond similarity index 100% rename from target/device/Atmel/misc-patches/linux-2.6.24-avr32-ac97-reset.patch rename to target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-avr32-ac97-reset.patch.cond diff --git a/target/device/Atmel/misc-patches/linux-2.6.24-avr32-psif-2.patch b/target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-avr32-psif-2.patch.cond similarity index 100% rename from target/device/Atmel/misc-patches/linux-2.6.24-avr32-psif-2.patch rename to target/device/Atmel/arch-avr32/kernel-patches-2.6.24/linux-2.6.24-avr32-psif-2.patch.cond diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig index fe8bb89cae..192fc9e847 100644 --- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig +++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Mon Mar 17 22:02:39 2008 +# Sat Mar 29 23:43:32 2008 # BR2_HAVE_DOT_CONFIG=y BR2_VERSION="0.10.0-svn" @@ -58,7 +58,7 @@ BR2_BANNER="Welcome to the Erik's uClibc development environment running on the # # Preset Devices # -# BR2_TARGET_ARM is not set +# BR2_TARGET_ARMLTD is not set BR2_TARGET_ATMEL=y # @@ -110,6 +110,10 @@ BR2_TARGET_AT91BOOT_DATAFLASHCARD=y BR2_TARGET_AT91BOOTSTRAP_MEMORY="dataflashcard" # BR2_TARGET_SHARP is not set +# +# Generic Architecture support +# + # # Generic System Support # @@ -196,17 +200,13 @@ BR2_EXT_UCLIBC_VERSION_0_9_28_3=y # BR2_KERNEL_HEADERS_2_6_20 is not set # BR2_KERNEL_HEADERS_2_6_21_5 is not set # BR2_KERNEL_HEADERS_2_6_21 is not set -BR2_KERNEL_HEADERS_2_6_22_1=y +# BR2_KERNEL_HEADERS_2_6_22_1 is not set # BR2_KERNEL_HEADERS_2_6_22_10 is not set # BR2_KERNEL_HEADERS_2_6_22 is not set # BR2_KERNEL_HEADERS_2_6_23 is not set -# BR2_KERNEL_HEADERS_2_6_24 is not set +BR2_KERNEL_HEADERS_2_6_24=y # BR2_KERNEL_HEADERS_SNAP is not set -# BR2_KERNEL_HEADERS_IPMI is not set -# BR2_KERNEL_HEADERS_LZMA is not set -# BR2_KERNEL_HEADERS_RT is not set -BR2_KERNEL_HEADERS_PATCH_DIR=y -BR2_DEFAULT_KERNEL_HEADERS="2.6.22.1" +BR2_DEFAULT_KERNEL_HEADERS="2.6.24" # # uClibc Options @@ -215,7 +215,7 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.22.1" BR2_UCLIBC_VERSION_0_9_29=y # BR2_UCLIBC_VERSION_SNAPSHOT is not set BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.29.config" -# BR2_ENABLE_LOCALE is not set +BR2_ENABLE_LOCALE=y # BR2_PTHREADS_NONE is not set # BR2_PTHREADS is not set BR2_PTHREADS_OLD=y @@ -281,8 +281,8 @@ BR2_PACKAGE_SSTRIP_TARGET=y BR2_PACKAGE_SSTRIP_HOST=y # BR2_ENABLE_MULTILIB is not set BR2_LARGEFILE=y -# BR2_INET_IPV6 is not set -# BR2_INET_RPC is not set +BR2_INET_IPV6=y +BR2_INET_RPC=y BR2_USE_WCHAR=y # BR2_SOFT_FLOAT is not set BR2_TARGET_OPTIMIZATION="-Os -pipe" @@ -296,30 +296,24 @@ BR2_PACKAGE_BUSYBOX=y # BR2_BUSYBOX_VERSION_1_6_1 is not set # BR2_BUSYBOX_VERSION_1_7_X is not set # BR2_BUSYBOX_VERSION_1_8_X is not set -BR2_BUSYBOX_VERSION_1_9_X=y +# BR2_BUSYBOX_VERSION_1_9_X is not set +BR2_BUSYBOX_VERSION_1_10_X=y # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set -BR2_BUSYBOX_VERSION="1.9.1" -BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y +BR2_BUSYBOX_VERSION="1.10.0" +BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.6.0.config" -# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set +BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y # BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system # -# BR2_PACKAGE_BASH is not set -# BR2_PACKAGE_BZIP2 is not set -# BR2_PACKAGE_COREUTILS is not set +BR2_PACKAGE_BASH=y +BR2_PACKAGE_BZIP2=y # BR2_PACKAGE_DIFFUTILS is not set -# BR2_PACKAGE_FINDUTILS is not set # BR2_PACKAGE_FLEX is not set -# BR2_PACKAGE_GAWK is not set # BR2_PACKAGE_GCC_TARGET is not set -# BR2_PACKAGE_GREP is not set # BR2_PACKAGE_MAKE is not set -# BR2_PACKAGE_PATCH is not set -# BR2_PACKAGE_SED is not set -# BR2_PACKAGE_TAR is not set # # Other development stuff @@ -333,19 +327,22 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.6.0.config" # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set BR2_HOST_FAKEROOT=y -# BR2_PACKAGE_GETTEXT is not set -# BR2_PACKAGE_LIBINTL is not set +BR2_PACKAGE_GETTEXT=y +# BR2_PACKAGE_GETTEXT_STATIC is not set +BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBGMP is not set # BR2_PACKAGE_LIBMPFR is not set # BR2_PACKAGE_LIBTOOL is not set # BR2_PACKAGE_M4 is not set # BR2_PACKAGE_PKGCONFIG is not set -# BR2_READLINE is not set +BR2_READLINE=y +BR2_PACKAGE_READLINE_TARGET=y +# BR2_PACKAGE_READLINE_HEADERS is not set # # Other stuff # -# BR2_PACKAGE_AT is not set +BR2_PACKAGE_AT=y # BR2_PACKAGE_BERKELEYDB is not set # BR2_PACKAGE_BSDIFF is not set # BR2_PACKAGE_CUPS is not set @@ -356,56 +353,46 @@ BR2_HOST_FAKEROOT=y # BR2_PACKAGE_ICU is not set # BR2_PACKAGE_IPKG is not set # BR2_PACKAGE_KEXEC is not set -# BR2_PACKAGE_LESS is not set BR2_PACKAGE_LIBDAEMON=y # BR2_PACKAGE_LIBELF is not set -# BR2_PACKAGE_LIBEVENT is not set +BR2_PACKAGE_LIBEVENT=y # BR2_PACKAGE_LIBFLOAT is not set # BR2_PACKAGE_LIBGCRYPT is not set # BR2_PACKAGE_LIBGPG_ERROR is not set -# BR2_PACKAGE_LIBLOCKFILE is not set +BR2_PACKAGE_LIBLOCKFILE=y # BR2_PACKAGE_LIBSYSFS is not set -# BR2_PACKAGE_LOCKFILE_PROGS is not set +BR2_PACKAGE_LOCKFILE_PROGS=y # BR2_PACKAGE_LSOF is not set # BR2_PACKAGE_LTP-TESTSUITE is not set # BR2_PACKAGE_LTRACE is not set # BR2_PACKAGE_LTT is not set -# BR2_PACKAGE_MODULE_INIT_TOOLS is not set -# BR2_PACKAGE_MODUTILS is not set # BR2_PACKAGE_NG_SPICE_REWORK is not set # BR2_PACKAGE_PORTAGE is not set -# BR2_PACKAGE_PROCPS is not set -# BR2_PACKAGE_PSMISC is not set # BR2_PACKAGE_SQLITE is not set # BR2_PACKAGE_STARTUP_NOTIFICATION is not set # BR2_PACKAGE_STRACE is not set # BR2_PACKAGE_SUDO is not set -# BR2_PACKAGE_SYSKLOGD is not set -# BR2_PACKAGE_SYSVINIT is not set -# BR2_PACKAGE_TINYLOGIN is not set -# BR2_PACKAGE_UTIL-LINUX is not set -# BR2_PACKAGE_WHICH is not set -# BR2_TEXTEDIT_SUPPORT is not set BR2_NETWORK_SUPPORT=y # # Networking applications # - -# -# argus - disabled (requires libpcap) -# -# BR2_PACKAGE_AVAHI is not set -# BR2_PACKAGE_BOA is not set +# BR2_PACKAGE_ARGUS is not set +BR2_PACKAGE_AVAHI=y +BR2_PACKAGE_AVAHI_AUTOIPD=y +# BR2_PACKAGE_AVAHI_DAEMON is not set +BR2_PACKAGE_BOA=y # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BRIDGE is not set # BR2_PACKAGE_CURL is not set # BR2_PACKAGE_LIBCURL is not set -# BR2_PACKAGE_ISC_DHCP is not set # BR2_PACKAGE_DNSMASQ is not set -# BR2_PACKAGE_DROPBEAR is not set -# BR2_PACKAGE_ETHTOOL is not set -# BR2_PACKAGE_HASERL is not set +BR2_PACKAGE_DROPBEAR=y +BR2_PACKAGE_ETHTOOL=y +BR2_PACKAGE_HASERL=y +# BR2_PACKAGE_HASERL_VERSION_0_8_0 is not set +BR2_PACKAGE_HASERL_VERSION_0_9_22=y +BR2_PACKAGE_HASERL_VERSION="0.9.22" # BR2_PACKAGE_IRDA_UTILS is not set # BR2_PACKAGE_IPERF is not set # BR2_PACKAGE_IPROUTE2 is not set @@ -415,29 +402,42 @@ BR2_NETWORK_SUPPORT=y # # BR2_PACKAGE_IPTABLES is not set # BR2_PACKAGE_KISMET is not set -# BR2_PACKAGE_L2TP is not set +BR2_PACKAGE_L2TP=y # BR2_PACKAGE_LIBCGI is not set # BR2_PACKAGE_LIBCGICC is not set # BR2_PACKAGE_LIBEXOSIP2 is not set # BR2_PACKAGE_LIBOSIP2 is not set -# BR2_PACKAGE_LIBPCAP is not set +BR2_PACKAGE_LIBPCAP=y # BR2_PACKAGE_LINKS is not set -# BR2_PACKAGE_LRZSZ is not set +BR2_PACKAGE_LRZSZ=y # BR2_PACKAGE_MDNSRESPONDER is not set -# BR2_PACKAGE_MICROCOM is not set +BR2_PACKAGE_MICROCOM=y # BR2_PACKAGE_MROUTED is not set # BR2_PACKAGE_MUTT is not set # BR2_PACKAGE_NBD is not set -# BR2_PACKAGE_NCFTP is not set -# BR2_PACKAGE_NETCAT is not set +BR2_PACKAGE_NCFTP=y + +# +# ncFTP tools selection +# +BR2_PACKAGE_NCFTP_GET=y +BR2_PACKAGE_NCFTP_PUT=y +BR2_PACKAGE_NCFTP_LS=y +BR2_PACKAGE_NCFTP_BATCH=y +# BR2_PACKAGE_NCFTP_SPOOLER is not set +# BR2_PACKAGE_NCFTP_BOOKMARKS is not set # BR2_PACKAGE_NETKITBASE is not set # BR2_PACKAGE_NETKITTELNET is not set -# BR2_PACKAGE_NETPLUG is not set +BR2_PACKAGE_NETPLUG=y # BR2_PACKAGE_NETSNMP is not set +BR2_PACKAGE_NFS_UTILS=y # -# nfs-utils requires a toolchain with 'Enable RPC' selected +# NFS utilities selection # +# BR2_PACKAGE_NFS_UTILS_RPCDEBUG is not set +# BR2_PACKAGE_NFS_UTILS_RPC_LOCKD is not set +# BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD is not set # BR2_PACKAGE_NTP is not set # BR2_PACKAGE_OLSR is not set # BR2_PACKAGE_OPENNTPD is not set @@ -445,12 +445,9 @@ BR2_NETWORK_SUPPORT=y # BR2_PACKAGE_OPENSSL is not set # BR2_PACKAGE_OPENVPN is not set # BR2_PACKAGE_OPENSWAN is not set - -# -# portmap requires a toolchain with 'Enable RPC' selected -# -# BR2_PACKAGE_PPPD is not set -# BR2_PACKAGE_RP_PPPOE is not set +BR2_PACKAGE_PORTMAP=y +BR2_PACKAGE_PPPD=y +BR2_PACKAGE_RP_PPPOE=y # BR2_PACKAGE_PPTP_LINUX is not set # BR2_PACKAGE_PROFTPD is not set # BR2_PACKAGE_QUAGGA is not set @@ -463,33 +460,58 @@ BR2_NETWORK_SUPPORT=y # BR2_PACKAGE_QUAGGA_RIPD is not set # BR2_PACKAGE_QUAGGA_RIPNGD is not set # BR2_PACKAGE_QUAGGA_OSPFD is not set +# BR2_PACKAGE_QUAGGA_OSPF6D is not set # BR2_PACKAGE_QUAGGA_WATCHQUAGGA is not set # BR2_PACKAGE_QUAGGA_ISISD is not set -# BR2_PACKAGE_RSYNC is not set -# BR2_PACKAGE_SAMBA is not set -# BR2_PACKAGE_SOCAT is not set +BR2_PACKAGE_RSYNC=y +BR2_PACKAGE_SAMBA=y + +# +# Samba tools selection +# +BR2_PACKAGE_SAMBA_CIFS=y +BR2_PACKAGE_SAMBA_EVENTLOGADM=y +BR2_PACKAGE_SAMBA_NET=y +BR2_PACKAGE_SAMBA_NMBD=y +BR2_PACKAGE_SAMBA_NMBLOOKUP=y +BR2_PACKAGE_SAMBA_NTLM_AUTH=y +BR2_PACKAGE_SAMBA_PDBEDIT=y +BR2_PACKAGE_SAMBA_PROFILES=y +BR2_PACKAGE_SAMBA_RPCCLIENT=y +BR2_PACKAGE_SAMBA_SMBCACLS=y +BR2_PACKAGE_SAMBA_SMBCLIENT=y +BR2_PACKAGE_SAMBA_SMBCONTROL=y +BR2_PACKAGE_SAMBA_SMBCQUOTAS=y +BR2_PACKAGE_SAMBA_SMBGET=y +BR2_PACKAGE_SAMBA_SMBPASSWD=y +BR2_PACKAGE_SAMBA_SMBSPOOL=y +BR2_PACKAGE_SAMBA_SMBSTATUS=y +BR2_PACKAGE_SAMBA_SMBTREE=y +BR2_PACKAGE_SAMBA_SWAT=y +BR2_PACKAGE_SAMBA_TDB=y +BR2_PACKAGE_SAMBA_TESTPARM=y +BR2_PACKAGE_SAMBA_WINBINDD=y +BR2_PACKAGE_SAMBA_WBINFO=y +BR2_PACKAGE_SOCAT=y # BR2_PACKAGE_STUNNEL is not set # BR2_PACKAGE_TCPDUMP is not set # BR2_PACKAGE_DHCPDUMP is not set -# BR2_PACKAGE_TFTPD is not set -# BR2_PACKAGE_LIGHTTPD is not set -# BR2_PACKAGE_THTTPD is not set -# BR2_PACKAGE_TINYHTTPD is not set +BR2_PACKAGE_TFTPD=y # BR2_PACKAGE_TN5250 is not set # BR2_PACKAGE_TTCP is not set +# BR2_PACKAGE_UDPCAST is not set # # vpnc - disabled (requires libgcrypt and libgpg_error) # # BR2_PACKAGE_VTUN is not set -# BR2_PACKAGE_WGET is not set # BR2_PACKAGE_WIRELESS_TOOLS is not set BR2_BLOCKDEV_SUPPORT=y - -# -# dbus not available (need expat or libxml2) -# -# BR2_PACKAGE_DM is not set +BR2_PACKAGE_DBUS=y +BR2_DBUS_EXPAT=y +# BR2_DBUS_LIBXML2 is not set +# BR2_PACKAGE_DBUS_GLIB is not set +BR2_PACKAGE_DM=y # BR2_PACKAGE_DMRAID is not set # BR2_PACKAGE_E2FSPROGS is not set # BR2_PACKAGE_FCONFIG is not set @@ -497,58 +519,54 @@ BR2_BLOCKDEV_SUPPORT=y # BR2_PACKAGE_LIBFUSE is not set # BR2_PACKAGE_GADGETFS_TEST is not set # BR2_PACKAGE_HAL is not set -# BR2_PACKAGE_HDPARM is not set -# BR2_PACKAGE_HOTPLUG is not set # BR2_PACKAGE_HWDATA is not set # BR2_PACKAGE_IOSTAT is not set # BR2_PACKAGE_LIBAIO is not set # BR2_PACKAGE_LIBRAW1394 is not set -# BR2_PACKAGE_LIBUSB is not set +BR2_PACKAGE_LIBUSB=y # BR2_PACKAGE_LM_SENSORS is not set # BR2_PACKAGE_LVM2 is not set # BR2_PACKAGE_MDADM is not set # BR2_PACKAGE_MEMTESTER is not set -# BR2_PACKAGE_MKDOSFS is not set +BR2_PACKAGE_MKDOSFS=y BR2_PACKAGE_MTD=y # BR2_PACKAGE_MTD_UTILS is not set BR2_PACKAGE_MTD_20061007=y # BR2_PACKAGE_MTD_20050122 is not set -# BR2_PACKAGE_MTD_SNAPSHOT is not set -BR2_PACKAGE_MTD_ORIG_STRING="mtd_20061007.orig.tar.gz" +# BR2_PACKAGE_MTD_UTILS_GIT is not set # # MTD tools selection # +BR2_PACKAGE_MTD_DOCFDISK=y +BR2_PACKAGE_MTD_DOC_LOADBIOS=y +BR2_PACKAGE_MTD_FLASHCP=y BR2_PACKAGE_MTD_FLASH_ERASE=y BR2_PACKAGE_MTD_FLASH_ERASEALL=y BR2_PACKAGE_MTD_FLASH_INFO=y BR2_PACKAGE_MTD_FLASH_LOCK=y BR2_PACKAGE_MTD_FLASH_UNLOCK=y -BR2_PACKAGE_MTD_FLASHCP=y -BR2_PACKAGE_MTD_ERASE=y -BR2_PACKAGE_MTD_JFFS2DUMP=y -BR2_PACKAGE_MTD_SUMTOOL=y BR2_PACKAGE_MTD_FTL_CHECK=y BR2_PACKAGE_MTD_FTL_FORMAT=y -BR2_PACKAGE_MTD_NFTL_FORMAT=y -BR2_PACKAGE_MTD_NFTLDUMP=y +BR2_PACKAGE_MTD_JFFS2DUMP=y BR2_PACKAGE_MTD_MKFSJFFS2=y BR2_PACKAGE_MTD_MKFSJFFS=y +BR2_PACKAGE_MTD_MTD_DEBUG=y BR2_PACKAGE_MTD_NANDDUMP=y BR2_PACKAGE_MTD_NANDWRITE=y -BR2_PACKAGE_MTD_MTD_DEBUG=y -BR2_PACKAGE_MTD_DOCFDISK=y -BR2_PACKAGE_MTD_DOC_LOADBIOS=y +BR2_PACKAGE_MTD_NFTL_FORMAT=y +BR2_PACKAGE_MTD_NFTLDUMP=y +BR2_PACKAGE_MTD_SUMTOOL=y # BR2_PACKAGE_NTFS-3G is not set # BR2_PACKAGE_PCIUTILS is not set # BR2_PACKAGE_PCMCIA is not set # BR2_PACKAGE_RAIDTOOLS is not set -# BR2_PACKAGE_SETSERIAL is not set -# BR2_PACKAGE_SFDISK is not set +BR2_PACKAGE_SETSERIAL=y # BR2_PACKAGE_SMARTMONTOOLS is not set -# BR2_PACKAGE_UDEV is not set -# BR2_PACKAGE_USBMOUNT is not set -# BR2_PACKAGE_USBUTILS is not set +BR2_PACKAGE_UDEV_VOLUME_ID=y +BR2_PACKAGE_UDEV_SCSI_ID=y +BR2_PACKAGE_USBMOUNT=y +BR2_PACKAGE_USBUTILS=y # BR2_PACKAGE_WIPE is not set # BR2_PACKAGE_XFSPROGS is not set BR2_AUDIO_SUPPORT=y @@ -573,7 +591,8 @@ BR2_GRAPHIC_SUPPORT=y # # text rendering libraries # -# BR2_PACKAGE_NCURSES is not set +BR2_PACKAGE_NCURSES=y +# BR2_PACKAGE_NCURSES_TARGET_HEADERS is not set # BR2_PACKAGE_NEWT is not set # BR2_PACKAGE_SLANG is not set @@ -636,6 +655,7 @@ BR2_X11_PREFIX="/usr" # BR2_PACKAGE_FONTCONFIG is not set # BR2_PACKAGE_FREETYPE is not set # BR2_PACKAGE_TSLIB is not set +# BR2_PACKAGE_WEBKIT is not set # # X Window managers @@ -649,23 +669,24 @@ BR2_X11_PREFIX="/usr" # # X applications # +# BR2_PACKAGE_ALSAMIXERGUI is not set # # dillo - disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7)) # +# BR2_PACKAGE_DOCKER is not set +# BR2_PACKAGE_GQVIEW is not set +# BR2_PACKAGE_LEAFPAD is not set # # midori - disabled (requires Xorg(7)) # -# BR2_PACKAGE_WEBKIT is not set -# BR2_PACKAGE_GQVIEW is not set -# BR2_PACKAGE_LEAFPAD is not set -# BR2_PACKAGE_TORSMO is not set # BR2_PACKAGE_PCMANFM is not set -# BR2_PACKAGE_XSTROKE is not set # BR2_PACKAGE_SYLPHEED is not set -# BR2_PACKAGE_XPDF is not set +# BR2_PACKAGE_TORSMO is not set # BR2_PACKAGE_X11VNC is not set +# BR2_PACKAGE_XPDF is not set +# BR2_PACKAGE_XSTROKE is not set # BR2_PACKAGE_XVKBD is not set # @@ -673,32 +694,29 @@ BR2_X11_PREFIX="/usr" # # BR2_PACKAGE_MPLAYER is not set BR2_COMPRESSOR_SUPPORT=y -# BR2_PACKAGE_GZIP is not set # BR2_PACKAGE_LZO is not set # BR2_PACKAGE_LZMA_TARGET is not set # BR2_PACKAGE_LZMA_HOST is not set BR2_PACKAGE_ZLIB=y # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set BR2_SCRIPTING_SUPPORT=y - -# -# lua - disabled (requires readline and ncurses) -# +# BR2_PACKAGE_LUA is not set # BR2_PACKAGE_MICROPERL is not set # BR2_PACKAGE_PYTHON is not set # BR2_PACKAGE_RUBY is not set # BR2_PACKAGE_TCL is not set # BR2_PACKAGE_PHP is not set +BR2_XML_SUPPORT=y +BR2_PACKAGE_EXPAT=y +# BR2_PACKAGE_EZXML is not set +# BR2_PACKAGE_LIBXML2 is not set # -# PHP Extensions -# - -# -# Database extensions +# libxslt - disabled (requires pkgconfig) # -# BR2_XML_SUPPORT is not set -# BR2_JAVA_SUPPORT is not set +# BR2_PACKAGE_XERCES is not set +BR2_JAVA_SUPPORT=y +# BR2_PACKAGE_CLASSPATH is not set BR2_GAMES=y # BR2_PACKAGE_LXDOOM is not set # BR2_PACKAGE_LXDOOM_WAD is not set @@ -727,7 +745,7 @@ BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="" +BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot" BR2_TARGET_ROOTFS_JFFS2=y BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -744,7 +762,7 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="" +BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot" # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set # BR2_TARGET_ROOTFS_CPIO is not set @@ -762,34 +780,60 @@ BR2_KERNEL_LINUX_ADVANCED=y # BR2_KERNEL_LINUX is not set # BR2_KERNEL_HURD is not set BR2_PACKAGE_LINUX=y -BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(LINUX26_VERSION).config" -BR2_PACKAGE_LINUX_FORMAT="vmlinux" -BR2_KERNEL_CURRENT_VERSION="2.6.24" +BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config" +BR2_PACKAGE_LINUX_FORMAT="uImage" +BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)" +BR2_KERNEL_CURRENT_VERSION="2.6.24.4" +BR2_KERNEL_NEXT_VERSION="2.6.25" +BR2_KERNEL_THIS_VERSION="2.6.24" BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/" BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6" BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)" +BR2_KERNEL_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/" # BR2_LINUX_2_6_STABLE is not set -# BR2_LINUX_2_6_24 is not set +BR2_LINUX_2_6_24=y # BR2_LINUX_2_6_23 is not set # BR2_LINUX_2_6_22_10 is not set -BR2_LINUX_2_6_22_1=y +# BR2_LINUX_2_6_22_1 is not set # BR2_LINUX_2_6_22 is not set # BR2_LINUX_2_6_21_7 is not set # BR2_LINUX_2_6_21_5 is not set # BR2_LINUX_2_6_21 is not set # BR2_LINUX_2_6_20 is not set +# BR2_LINUX_2_6_25 is not set # BR2_LINUX26_CUSTOM is not set # # Patches # -# BR2_KERNEL_ADD_PATCH is not set -BR2_LINUX_BSP_PATCH="linux-2.6.20.4-atmel.patch.bz2" -BR2_KERNEL_PREPATCHED=y -# BR2_KERNEL_BASE is not set +BR2_KERNEL_ADD_KERNEL_ORG_PATCH=y +# BR2_KERNEL_ADD_LATEST is not set +# BR2_KERNEL_ADD_LATEST_MINORPATCH is not set +BR2_KERNEL_ADD_MINORPATCH=y +# BR2_KERNEL_ADD_LATEST_RC_PATCH is not set +# BR2_KERNEL_ADD_RC_PATCH is not set +# BR2_KERNEL_ADD_LATEST_SNAPSHOT is not set +# BR2_KERNEL_ADD_SNAPSHOT is not set +# BR2_KERNEL_ADD_LATEST_MM_PATCH is not set +# BR2_KERNEL_ADD_MM_PATCH is not set +BR2_KERNEL_ADD_PATCH=y +BR2_KERNEL_MINORLEVEL="4" +BR2_KERNEL_ARCH_PATCH_ENABLED=y +BR2_ARCH_AT91_2_6_24=y +# BR2_ARCH_AT91_2_6_22_1 is not set +# BR2_ARCH_AT91_2_6_21_5 is not set +# BR2_ARCH_AT91_2_6_21_1 is not set +# BR2_ARCH_AT91_2_6_20_4 is not set +BR2_KERNEL_ARCH_PATCH_VERSION="2.6.24" +BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)" +BR2_LINUX_BOARD_PATCH=y +BR2_LINUX_BSP_PATCH="" +BR2_KERNEL_PATCH="patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2" +# BR2_KERNEL_PREPATCHED is not set +BR2_KERNEL_BASE=y # BR2_KERNEL_LATEST is not set -BR2_DOWNLOAD_LINUX26_VERSION="2.6.22.1" -BR2_LINUX26_VERSION="2.6.22.1" +BR2_DOWNLOAD_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)" +BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)" # # Linux Kernel Configuration @@ -798,8 +842,8 @@ BR2_PACKAGE_LINUX_USE_KCONFIG=y # BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set # BR2_PACKAGE_LINUX_USE_XCONFIG is not set # BR2_LINUX_BIN_BZIMAGE is not set -# BR2_LINUX_BIN_UIMAGE is not set -BR2_LINUX_BIN_VMLINUX=y +BR2_LINUX_BIN_UIMAGE=y +# BR2_LINUX_BIN_VMLINUX is not set # BR2_LINUX_BIN_ZIMAGE is not set # BR2_LINUX_BIN_CUSTOM is not set @@ -808,5 +852,5 @@ BR2_LINUX_BIN_VMLINUX=y # # BR2_LINUX_COPYTO_ROOTFS is not set BR2_LINUX_COPYTO_TFTPBOOT=y -BR2_LINUX_COPYTO="/tftpboot" +BR2_LINUX_COPYTO="" BR2_LINUX_COPY_CONFIGURATION=y diff --git a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.23-100-avr32-atmel.2.patch b/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.23-100-avr32-atmel.2.patch deleted file mode 100644 index 1f0a5f542a..0000000000 --- a/target/device/Atmel/atngw100-expanded/kernel-patches/linux-2.6.23-100-avr32-atmel.2.patch +++ /dev/null @@ -1,19857 +0,0 @@ - MAINTAINERS | 7 + - Makefile | 2 +- - arch/avr32/Kconfig | 34 +- - arch/avr32/Makefile | 3 +- - arch/avr32/boards/atngw100/Kconfig | 12 + - arch/avr32/boards/atngw100/flash.c | 5 +- - arch/avr32/boards/atngw100/setup.c | 26 +- - arch/avr32/boards/atstk1000/Kconfig | 82 +- - arch/avr32/boards/atstk1000/Makefile | 2 + - arch/avr32/boards/atstk1000/atstk1000.h | 2 + - arch/avr32/boards/atstk1000/atstk1002.c | 148 ++- - arch/avr32/boards/atstk1000/atstk1003.c | 181 +++ - arch/avr32/boards/atstk1000/atstk1004.c | 152 +++ - arch/avr32/boards/atstk1000/flash.c | 5 +- - arch/avr32/boards/atstk1000/setup.c | 64 + - arch/avr32/configs/atngw100_defconfig | 210 +++- - arch/avr32/configs/atstk1002_defconfig | 482 +++++-- - arch/avr32/configs/atstk1003_defconfig | 1045 ++++++++++++++ - arch/avr32/configs/atstk1004_defconfig | 722 ++++++++++ - arch/avr32/drivers/Makefile | 1 + - arch/avr32/drivers/dw-dmac.c | 761 +++++++++++ - arch/avr32/drivers/dw-dmac.h | 42 + - arch/avr32/kernel/Makefile | 6 +- - arch/avr32/kernel/dma-controller.c | 34 + - arch/avr32/kernel/entry-avr32b.S | 26 +- - arch/avr32/kernel/setup.c | 2 +- - arch/avr32/kernel/vmlinux.lds.S | 143 ++ - arch/avr32/kernel/vmlinux.lds.c | 142 -- - arch/avr32/mach-at32ap/Kconfig | 19 +- - arch/avr32/mach-at32ap/Makefile | 5 +- - arch/avr32/mach-at32ap/at32ap7000.c | 1324 ------------------ - arch/avr32/mach-at32ap/at32ap700x.c | 1754 ++++++++++++++++++++++++ - arch/avr32/mach-at32ap/clock.c | 116 ++ - arch/avr32/mach-at32ap/gpio-dev.c | 573 ++++++++ - arch/avr32/mach-at32ap/hsmc.c | 129 ++- - arch/avr32/mach-at32ap/pio.c | 80 ++ - arch/avr32/mach-at32ap/pm.h | 8 + - arch/avr32/mm/dma-coherent.c | 7 + - arch/avr32/mm/init.c | 12 +- - drivers/char/watchdog/Kconfig | 2 +- - drivers/char/watchdog/at32ap700x_wdt.c | 69 +- - drivers/i2c/busses/Kconfig | 8 + - drivers/i2c/busses/Makefile | 1 + - drivers/i2c/busses/i2c-atmeltwi.c | 436 ++++++ - drivers/i2c/busses/i2c-atmeltwi.h | 117 ++ - drivers/misc/Kconfig | 9 + - drivers/misc/Makefile | 1 + - drivers/misc/atmel-ssc.c | 174 +++ - drivers/mmc/host/Kconfig | 10 + - drivers/mmc/host/Makefile | 1 + - drivers/mmc/host/atmel-mci.c | 1176 ++++++++++++++++ - drivers/mmc/host/atmel-mci.h | 192 +++ - drivers/mtd/chips/cfi_cmdset_0001.c | 43 + - drivers/mtd/chips/cfi_cmdset_0002.c | 6 +- - drivers/pcmcia/Kconfig | 7 + - drivers/pcmcia/Makefile | 1 + - drivers/pcmcia/at32_cf.c | 531 ++++++++ - drivers/pcmcia/cistpl.c | 48 +- - drivers/spi/atmel_spi.c | 4 +- - drivers/usb/gadget/Kconfig | 26 +- - drivers/usb/gadget/Makefile | 1 + - drivers/usb/gadget/atmel_usba_udc.c | 2038 ++++++++++++++++++++++++++++ - drivers/usb/gadget/atmel_usba_udc.h | 350 +++++ - drivers/video/atmel_lcdfb.c | 6 +- - drivers/video/backlight/Kconfig | 12 + - drivers/video/backlight/Makefile | 2 + - drivers/video/backlight/ltv350qv.c | 339 +++++ - drivers/video/backlight/ltv350qv.h | 95 ++ - include/asm-avr32/arch-at32ap/at32ap7000.h | 35 - - include/asm-avr32/arch-at32ap/at32ap700x.h | 35 + - include/asm-avr32/arch-at32ap/board.h | 39 + - include/asm-avr32/arch-at32ap/cpu.h | 2 +- - include/asm-avr32/arch-at32ap/io.h | 4 +- - include/asm-avr32/arch-at32ap/portmux.h | 13 + - include/asm-avr32/arch-at32ap/smc.h | 51 +- - include/asm-avr32/dma-controller.h | 166 +++ - include/asm-avr32/dma-mapping.h | 17 +- - include/asm-avr32/system.h | 13 +- - include/asm-avr32/unistd.h | 13 + - include/linux/atmel-ssc.h | 312 +++++ - include/linux/spi/at73c213.h | 25 + - include/pcmcia/cs_types.h | 2 +- - init/do_mounts.c | 8 +- - scripts/checkstack.pl | 5 + - sound/Kconfig | 6 + - sound/Makefile | 3 +- - sound/avr32/Kconfig | 11 + - sound/avr32/Makefile | 3 + - sound/avr32/ac97c.c | 914 +++++++++++++ - sound/avr32/ac97c.h | 71 + - sound/oss/Kconfig | 4 + - sound/oss/Makefile | 1 + - sound/oss/at32_abdac.c | 722 ++++++++++ - sound/oss/at32_abdac.h | 59 + - sound/spi/Kconfig | 31 + - sound/spi/Makefile | 5 + - sound/spi/at73c213.c | 1121 +++++++++++++++ - sound/spi/at73c213.h | 119 ++ - 98 files changed, 16057 insertions(+), 1826 deletions(-) - create mode 100644 arch/avr32/boards/atngw100/Kconfig - create mode 100644 arch/avr32/boards/atstk1000/atstk1003.c - create mode 100644 arch/avr32/boards/atstk1000/atstk1004.c - create mode 100644 arch/avr32/configs/atstk1003_defconfig - create mode 100644 arch/avr32/configs/atstk1004_defconfig - create mode 100644 arch/avr32/drivers/Makefile - create mode 100644 arch/avr32/drivers/dw-dmac.c - create mode 100644 arch/avr32/drivers/dw-dmac.h - create mode 100644 arch/avr32/kernel/dma-controller.c - create mode 100644 arch/avr32/kernel/vmlinux.lds.S - delete mode 100644 arch/avr32/kernel/vmlinux.lds.c - delete mode 100644 arch/avr32/mach-at32ap/at32ap7000.c - create mode 100644 arch/avr32/mach-at32ap/at32ap700x.c - create mode 100644 arch/avr32/mach-at32ap/gpio-dev.c - create mode 100644 drivers/i2c/busses/i2c-atmeltwi.c - create mode 100644 drivers/i2c/busses/i2c-atmeltwi.h - create mode 100644 drivers/misc/atmel-ssc.c - create mode 100644 drivers/mmc/host/atmel-mci.c - create mode 100644 drivers/mmc/host/atmel-mci.h - create mode 100644 drivers/pcmcia/at32_cf.c - create mode 100644 drivers/usb/gadget/atmel_usba_udc.c - create mode 100644 drivers/usb/gadget/atmel_usba_udc.h - create mode 100644 drivers/video/backlight/ltv350qv.c - create mode 100644 drivers/video/backlight/ltv350qv.h - delete mode 100644 include/asm-avr32/arch-at32ap/at32ap7000.h - create mode 100644 include/asm-avr32/arch-at32ap/at32ap700x.h - create mode 100644 include/asm-avr32/dma-controller.h - create mode 100644 include/linux/atmel-ssc.h - create mode 100644 include/linux/spi/at73c213.h - create mode 100644 sound/avr32/Kconfig - create mode 100644 sound/avr32/Makefile - create mode 100644 sound/avr32/ac97c.c - create mode 100644 sound/avr32/ac97c.h - create mode 100644 sound/oss/at32_abdac.c - create mode 100644 sound/oss/at32_abdac.h - create mode 100644 sound/spi/Kconfig - create mode 100644 sound/spi/Makefile - create mode 100644 sound/spi/at73c213.c - create mode 100644 sound/spi/at73c213.h - -diff --git a/MAINTAINERS b/MAINTAINERS -index 9a91d9e..587afe3 100644 ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -669,6 +669,13 @@ P: Haavard Skinnemoen - M: hskinnemoen@atmel.com - S: Supported - -+ATMEL USBA UDC DRIVER -+P: Haavard Skinnemoen -+M: hskinnemoen@atmel.com -+L: kernel@avr32linux.org -+W: http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver -+S: Supported -+ - ATMEL WIRELESS DRIVER - P: Simon Kelley - M: simon@thekelleys.org.uk -diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig -index d12346a..62913a4 100644 ---- a/arch/avr32/Kconfig -+++ b/arch/avr32/Kconfig -@@ -87,19 +87,36 @@ config PLATFORM_AT32AP - select MMU - select PERFORMANCE_COUNTERS - -+config CPU_AT32AP700X -+ bool -+ select PLATFORM_AT32AP -+ - choice - prompt "AVR32 CPU type" - default CPU_AT32AP7000 - - config CPU_AT32AP7000 - bool "AT32AP7000" -- select PLATFORM_AT32AP -+ select CPU_AT32AP700X -+ -+config CPU_AT32AP7001 -+ bool "AT32AP7001" -+ select CPU_AT32AP700X -+ -+config CPU_AT32AP7002 -+ bool "AT32AP7002" -+ select CPU_AT32AP700X -+ - endchoice - - # - # CPU Daughterboards for ATSTK1000 - config BOARD_ATSTK1002 - bool -+config BOARD_ATSTK1003 -+ bool -+config BOARD_ATSTK1004 -+ bool - - choice - prompt "AVR32 board type" -@@ -108,6 +125,8 @@ choice - config BOARD_ATSTK1000 - bool "ATSTK1000 evaluation board" - select BOARD_ATSTK1002 if CPU_AT32AP7000 -+ select BOARD_ATSTK1003 if CPU_AT32AP7001 -+ select BOARD_ATSTK1004 if CPU_AT32AP7002 - - config BOARD_ATNGW100 - bool "ATNGW100 Network Gateway" -@@ -116,6 +135,9 @@ endchoice - if BOARD_ATSTK1000 - source "arch/avr32/boards/atstk1000/Kconfig" - endif -+if BOARD_ATNGW100 -+source "arch/avr32/boards/atngw100/Kconfig" -+endif - - choice - prompt "Boot loader type" -@@ -129,15 +151,15 @@ source "arch/avr32/mach-at32ap/Kconfig" - - config LOAD_ADDRESS - hex -- default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP7000=y -+ default 0x10000000 if LOADER_U_BOOT=y && CPU_AT32AP700X=y - - config ENTRY_ADDRESS - hex -- default 0x90000000 if LOADER_U_BOOT=y && CPU_AT32AP7000=y -+ default 0x90000000 if LOADER_U_BOOT=y && CPU_AT32AP700X=y - - config PHYS_OFFSET - hex -- default 0x10000000 if CPU_AT32AP7000=y -+ default 0x10000000 if CPU_AT32AP700X=y - - source "kernel/Kconfig.preempt" - -@@ -175,6 +197,10 @@ config OWNERSHIP_TRACE - enabling Nexus-compliant debuggers to keep track of the PID of the - currently executing task. - -+config DW_DMAC -+ tristate "Synopsys DesignWare DMA Controller support" -+ default y if CPU_AT32AP7000 -+ - # FPU emulation goes here - - source "kernel/Kconfig.hz" -diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile -index dc6bc01..96f0030 100644 ---- a/arch/avr32/Makefile -+++ b/arch/avr32/Makefile -@@ -16,7 +16,7 @@ AFLAGS += -mrelax -mno-pic - CFLAGS_MODULE += -mno-relax - LDFLAGS_vmlinux += --relax - --cpuflags-$(CONFIG_CPU_AT32AP7000) += -mcpu=ap7000 -+cpuflags-$(CONFIG_PLATFORM_AT32AP) += -march=ap - - CFLAGS += $(cpuflags-y) - AFLAGS += $(cpuflags-y) -@@ -31,6 +31,7 @@ core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/ - core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/ - core-y += arch/avr32/kernel/ - core-y += arch/avr32/mm/ -+drivers-y += arch/avr32/drivers/ - libs-y += arch/avr32/lib/ - - archincdir-$(CONFIG_PLATFORM_AT32AP) := arch-at32ap -diff --git a/arch/avr32/boards/atngw100/Kconfig b/arch/avr32/boards/atngw100/Kconfig -new file mode 100644 -index 0000000..5d922df ---- /dev/null -+++ b/arch/avr32/boards/atngw100/Kconfig -@@ -0,0 +1,12 @@ -+# NGW100 customization -+ -+config BOARD_ATNGW100_I2C_GPIO -+ bool "Use GPIO for i2c instead of built-in TWI module" -+ help -+ The driver for the built-in TWI module has been plagued by -+ various problems, while the i2c-gpio driver is based on the -+ trusty old i2c-algo-bit bitbanging engine, making it work -+ on pretty much any setup. -+ -+ Choose 'Y' here if you're having i2c-related problems and -+ want to rule out the i2c bus driver. -diff --git a/arch/avr32/boards/atngw100/flash.c b/arch/avr32/boards/atngw100/flash.c -index f9b32a8..b07ae63 100644 ---- a/arch/avr32/boards/atngw100/flash.c -+++ b/arch/avr32/boards/atngw100/flash.c -@@ -15,7 +15,7 @@ - - #include - --static struct smc_config flash_config __initdata = { -+static struct smc_timing flash_timing __initdata = { - .ncs_read_setup = 0, - .nrd_setup = 40, - .ncs_write_setup = 0, -@@ -28,7 +28,9 @@ static struct smc_config flash_config __initdata = { - - .read_cycle = 120, - .write_cycle = 120, -+}; - -+static struct smc_config flash_config __initdata = { - .bus_width = 2, - .nrd_controlled = 1, - .nwe_controlled = 1, -@@ -82,6 +84,7 @@ static int __init atngw100_flash_init(void) - { - int ret; - -+ smc_set_timing(&flash_config, &flash_timing); - ret = smc_set_configuration(0, &flash_config); - if (ret < 0) { - printk(KERN_ERR "atngw100: failed to set NOR flash timing\n"); -diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c -index ef80156..2a5f587 100644 ---- a/arch/avr32/boards/atngw100/setup.c -+++ b/arch/avr32/boards/atngw100/setup.c -@@ -42,6 +42,11 @@ static struct spi_board_info spi0_board_info[] __initdata = { - }, - }; - -+static struct mci_platform_data __initdata mci0_data = { -+ .detect_pin = GPIO_PIN_PC(25), -+ .wp_pin = GPIO_PIN_PE(0), -+}; -+ - /* - * The next two functions should go away as the boot loader is - * supposed to initialize the macb address registers with a valid -@@ -124,9 +129,13 @@ static struct platform_device ngw_gpio_leds = { - } - }; - -+#ifdef CONFIG_BOARD_ATNGW100_I2C_GPIO - static struct i2c_gpio_platform_data i2c_gpio_data = { -- .sda_pin = GPIO_PIN_PA(6), -- .scl_pin = GPIO_PIN_PA(7), -+ .sda_pin = GPIO_PIN_PA(6), -+ .scl_pin = GPIO_PIN_PA(7), -+ .sda_is_open_drain = 1, -+ .scl_is_open_drain = 1, -+ .udelay = 2, /* close to 100 kHz */ - }; - - static struct platform_device i2c_gpio_device = { -@@ -136,6 +145,7 @@ static struct platform_device i2c_gpio_device = { - .platform_data = &i2c_gpio_data, - }, - }; -+#endif - - static int __init atngw100_init(void) - { -@@ -154,6 +164,8 @@ static int __init atngw100_init(void) - set_hw_addr(at32_add_device_eth(1, ð_data[1])); - - at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info)); -+ at32_add_device_mci(0, &mci0_data); -+ at32_add_device_usba(0, NULL); - - for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) { - at32_select_gpio(ngw_leds[i].gpio, -@@ -161,9 +173,15 @@ static int __init atngw100_init(void) - } - platform_device_register(&ngw_gpio_leds); - -- at32_select_gpio(i2c_gpio_data.sda_pin, 0); -- at32_select_gpio(i2c_gpio_data.scl_pin, 0); -+#ifdef CONFIG_BOARD_ATNGW100_I2C_GPIO -+ at32_select_gpio(i2c_gpio_data.sda_pin, -+ AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH); -+ at32_select_gpio(i2c_gpio_data.scl_pin, -+ AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH); - platform_device_register(&i2c_gpio_device); -+#else -+ at32_add_device_twi(0); -+#endif - - return 0; - } -diff --git a/arch/avr32/boards/atstk1000/Kconfig b/arch/avr32/boards/atstk1000/Kconfig -index 718578f..aac73a6 100644 ---- a/arch/avr32/boards/atstk1000/Kconfig -+++ b/arch/avr32/boards/atstk1000/Kconfig -@@ -1,34 +1,34 @@ - # STK1000 customization - --if BOARD_ATSTK1002 -+if BOARD_ATSTK1000 - --config BOARD_ATSTK1002_CUSTOM -- bool "Non-default STK-1002 jumper settings" -+config BOARD_ATSTK100X_CUSTOM -+ bool "Non-default STK1002/STK1003/STK1004 jumper settings" - help - You will normally leave the jumpers on the CPU card at their - default settings. If you need to use certain peripherals, - you will need to change some of those jumpers. - --if BOARD_ATSTK1002_CUSTOM -+if BOARD_ATSTK100X_CUSTOM - --config BOARD_ATSTK1002_SW1_CUSTOM -+config BOARD_ATSTK100X_SW1_CUSTOM - bool "SW1: use SSC1 (not SPI0)" - help - This also prevents using the external DAC as an audio interface, - and means you can't initialize the on-board QVGA display. - --config BOARD_ATSTK1002_SW2_CUSTOM -+config BOARD_ATSTK100X_SW2_CUSTOM - bool "SW2: use IRDA or TIMER0 (not UART-A, MMC/SD, and PS2-A)" - help - If you change this you'll want an updated boot loader putting - the console on UART-C not UART-A. - --config BOARD_ATSTK1002_SW3_CUSTOM -+config BOARD_ATSTK100X_SW3_CUSTOM - bool "SW3: use TIMER1 (not SSC0 and GCLK)" - help - This also prevents using the external DAC as an audio interface. - --config BOARD_ATSTK1002_SW4_CUSTOM -+config BOARD_ATSTK100X_SW4_CUSTOM - bool "SW4: use ISI/Camera (not GPIOs, SPI1, and PS2-B)" - help - To use the camera interface you'll need a custom card (on the -@@ -36,27 +36,29 @@ config BOARD_ATSTK1002_SW4_CUSTOM - - config BOARD_ATSTK1002_SW5_CUSTOM - bool "SW5: use MACB1 (not LCDC)" -+ depends on BOARD_ATSTK1002 - - config BOARD_ATSTK1002_SW6_CUSTOM - bool "SW6: more GPIOs (not MACB0)" -+ depends on BOARD_ATSTK1002 - - endif # custom - --config BOARD_ATSTK1002_SPI1 -+config BOARD_ATSTK100X_SPI1 - bool "Configure SPI1 controller" -- depends on !BOARD_ATSTK1002_SW4_CUSTOM -+ depends on !BOARD_ATSTK100X_SW4_CUSTOM - help - All the signals for the second SPI controller are available on - GPIO lines and accessed through the J1 jumper block. Say "y" - here to configure that SPI controller. - --config BOARD_ATSTK1002_J2_LED -+config BOARD_ATSTK1000_J2_LED - bool -- default BOARD_ATSTK1002_J2_LED8 || BOARD_ATSTK1002_J2_RGB -+ default BOARD_ATSTK1000_J2_LED8 || BOARD_ATSTK1000_J2_RGB - - choice - prompt "LEDs connected to J2:" -- depends on LEDS_GPIO && !BOARD_ATSTK1002_SW4_CUSTOM -+ depends on LEDS_GPIO && !BOARD_ATSTK100X_SW4_CUSTOM - optional - help - Select this if you have jumpered the J2 jumper block to the -@@ -64,16 +66,64 @@ choice - IDC cable. A default "heartbeat" trigger is provided, but - you can of course override this. - --config BOARD_ATSTK1002_J2_LED8 -+config BOARD_ATSTK1000_J2_LED8 - bool "LED0..LED7" - help - Select this if J2 is jumpered to LED0..LED7 amber leds. - --config BOARD_ATSTK1002_J2_RGB -+config BOARD_ATSTK1000_J2_RGB - bool "RGB leds" - help - Select this if J2 is jumpered to the RGB leds. - - endchoice - --endif # stk 1002 -+config BOARD_ATSTK1000_EXTDAC -+ bool -+ depends on !BOARD_ATSTK100X_SW1_CUSTOM && !BOARD_ATSTK100X_SW3_CUSTOM -+ default y -+ -+config BOARD_ATSTK100X_ENABLE_AC97 -+ bool "Use AC97C instead of ABDAC" -+ help -+ Select this if you want to use the built-in AC97 controller -+ instead of the built-in Audio Bitstream DAC. These share -+ the same I/O pins on the AP7000, so both can't be enabled -+ at the same time. -+ -+ Note that the STK1000 kit doesn't ship with an AC97 codec on -+ board, so say N unless you've got an expansion board with an -+ AC97 codec on it that you want to use. -+ -+config BOARD_ATSTK1000_CF_HACKS -+ bool "ATSTK1000 CompactFlash hacks" -+ depends on !BOARD_ATSTK100X_SW4_CUSTOM -+ help -+ Select this if you have re-routed the CompactFlash RESET and -+ CD signals to GPIOs on your STK1000. This is necessary for -+ reset and card detection to work properly, although some CF -+ cards may be able to cope without reset. -+ -+config BOARD_ATSTK1000_CF_RESET_PIN -+ hex "CompactFlash RESET pin" -+ default 0x30 -+ depends on BOARD_ATSTK1000_CF_HACKS -+ help -+ Select which GPIO pin to use for the CompactFlash RESET -+ signal. This is specified as a hexadecimal number and should -+ be defined as 0x20 * gpio_port + pin. -+ -+ The default is 0x30, which is pin 16 on PIOB, aka GPIO14. -+ -+config BOARD_ATSTK1000_CF_DETECT_PIN -+ hex "CompactFlash DETECT pin" -+ default 0x3e -+ depends on BOARD_ATSTK1000_CF_HACKS -+ help -+ Select which GPIO pin to use for the CompactFlash CD -+ signal. This is specified as a hexadecimal number and should -+ be defined as 0x20 * gpio_port + pin. -+ -+ The default is 0x3e, which is pin 30 on PIOB, aka GPIO15. -+ -+endif # stk 1000 -diff --git a/arch/avr32/boards/atstk1000/Makefile b/arch/avr32/boards/atstk1000/Makefile -index 8e09922..beead86 100644 ---- a/arch/avr32/boards/atstk1000/Makefile -+++ b/arch/avr32/boards/atstk1000/Makefile -@@ -1,2 +1,4 @@ - obj-y += setup.o flash.o - obj-$(CONFIG_BOARD_ATSTK1002) += atstk1002.o -+obj-$(CONFIG_BOARD_ATSTK1003) += atstk1003.o -+obj-$(CONFIG_BOARD_ATSTK1004) += atstk1004.o -diff --git a/arch/avr32/boards/atstk1000/atstk1000.h b/arch/avr32/boards/atstk1000/atstk1000.h -index 9a49ed0..9392d32 100644 ---- a/arch/avr32/boards/atstk1000/atstk1000.h -+++ b/arch/avr32/boards/atstk1000/atstk1000.h -@@ -12,4 +12,6 @@ - - extern struct atmel_lcdfb_info atstk1000_lcdc_data; - -+void atstk1000_setup_j2_leds(void); -+ - #endif /* __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H */ -diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c -index c9981b7..d30de89 100644 ---- a/arch/avr32/boards/atstk1000/atstk1002.c -+++ b/arch/avr32/boards/atstk1000/atstk1002.c -@@ -11,17 +11,17 @@ - #include - #include - #include --#include - #include - #include - #include - #include -+#include - - #include