From cde20f0b084ca9f32885fb48384419de2a92ce01 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson
Date: Wed, 12 Mar 2008 01:13:46 +0000
Subject: Use 2.6.24 as default for at91sam9260dfc

---
 .../Atmel/at91sam9260dfc/at91sam9260dfc_defconfig  | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig')

diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
index e50db8207..dfa82365d 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
-# Tue Mar 11 11:17:13 2008
+# Wed Mar 12 01:51:24 2008
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_VERSION="0.10.0-svn"
@@ -39,8 +39,8 @@ BR2_generic_arm=y
 # BR2_xscale is not set
 # BR2_iwmmxt is not set
 BR2_ARM_TYPE="GENERIC_ARM"
-# BR2_ARM_OABI is not set
-BR2_ARM_EABI=y
+BR2_ARM_OABI=y
+# BR2_ARM_EABI is not set
 BR2_ARCH="arm"
 BR2_ENDIAN="LITTLE"
 
@@ -96,6 +96,12 @@ BR2_TARGET_AT91_ADVANCED_INFO=y
 BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6"
 BR2_TARGET_ATMEL_COPYTO="/tftpboot"
 BR2_BOARD_PATH="target/device/Atmel/$(BR2_BOARD_NAME)"
+BR2_TARGET_UBOOT_AT91=y
+BR2_TARGET_UBOOT_SERVERIP_AT91="10.175.196.221"
+BR2_TARGET_UBOOT_IPADDR_AT91="10.175.196.18"
+BR2_TARGET_UBOOT_GATEWAY_AT91="10.175.196.1"
+BR2_TARGET_UBOOT_NETMASK_AT91="255.255.255.0"
+BR2_TARGET_UBOOT_ETHADDR_AT91="04:25:fe:ed:00:18"
 BR2_TARGET_AT91BOOTSTRAP=y
 # BR2_TARGET_AT91BOOT_DATAFLASH is not set
 BR2_TARGET_AT91BOOT_DATAFLASHCARD=y
@@ -741,12 +747,6 @@ BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
 #
 # bootloader for target device
 #
-BR2_TARGET_UBOOT_AT91=y
-BR2_TARGET_UBOOT_SERVERIP_AT91="10.175.196.221"
-BR2_TARGET_UBOOT_IPADDR_AT91="10.175.196.18"
-BR2_TARGET_UBOOT_GATEWAY_AT91="10.175.196.1"
-BR2_TARGET_UBOOT_NETMASK_AT91="255.255.255.0"
-BR2_TARGET_UBOOT_ETHADDR_AT91="04:25:fe:ed:00:18"
 
 #
 # Kernel
@@ -757,7 +757,7 @@ BR2_KERNEL_LINUX_ADVANCED=y
 # 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="uImage"
+BR2_PACKAGE_LINUX_FORMAT="vmlinux"
 BR2_KERNEL_CURRENT_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"
@@ -792,8 +792,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=y
-# BR2_LINUX_BIN_VMLINUX is not set
+# BR2_LINUX_BIN_UIMAGE is not set
+BR2_LINUX_BIN_VMLINUX=y
 # BR2_LINUX_BIN_ZIMAGE is not set
 # BR2_LINUX_BIN_CUSTOM is not set
 
-- 
cgit v1.2.3-55-g7522