Merge branch 'bootloaders-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot

48 files changed, 2 insertions, 7286 deletions

diff --git a/target/Config.in b/target/Config.in
index 5d5363538..2d967931e 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -1,12 +1,3 @@
-menu "Bootloaders"
-
-source "target/x86/grub/Config.in"
-#source "target/x86/grub2/Config.in"
-source "target/x86/syslinux/Config.in"
-source "target/powerpc/yaboot/Config.in"
-source "target/u-boot/Config.in"
-endmenu
-
 menu "Kernel"
 choice
 	prompt "Kernel type"
diff --git a/target/Makefile.in b/target/Makefile.in
index ffcdbb64e..8feb5644d 100644
--- a/target/Makefile.in
+++ b/target/Makefile.in
@@ -54,16 +54,8 @@ include target/generic/Makefile.in
 
 # this eventually adds the kernel target to TARGETS:
 include target/device/Makefile.in
-include target/x86/Makefile.in
-include target/powerpc/Makefile.in
 include target/xtensa/Makefile.in
 
-ifeq ($(BR2_TARGET_UBOOT),y)
-include target/u-boot/Makefile.in
-endif
-
-include fs/common.mk
-
 # kernel rules
 # We already did add the kernel target to TARGETS and now just pull in the rules
 # to actually build this target.
diff --git a/target/device/Atmel/Config.in b/target/device/Atmel/Config.in
index 4e36b9092..870c537d1 100644
--- a/target/device/Atmel/Config.in
+++ b/target/device/Atmel/Config.in
@@ -66,8 +66,4 @@ config BR2_BOARD_PATH
 
 endmenu
 
-source "target/device/Atmel/DataFlashBoot/Config.in"
-
-source "target/device/Atmel/at91bootstrap/Config.in"
-
 endif
diff --git a/target/device/Atmel/DataFlashBoot/Config.in b/target/device/Atmel/DataFlashBoot/Config.in
deleted file mode 100644
index 1da5e6274..000000000
--- a/target/device/Atmel/DataFlashBoot/Config.in
+++ /dev/null
@@ -1,23 +0,0 @@
-config BR2_TARGET_DATAFLASHBOOT
-       depends on BR2_TARGET_AT91RM9200 || BR2_TARGET_AT91SAM9261 || BR2_TARGET_AT91SAM9261S
-	bool "Build Dataflashboot for selected chip"
-
-choice
-	prompt "Target Architecture"
-	default BR2_TARGET_DATAFLASHBOOT_AT91RM9200
-	depends on BR2_TARGET_DATAFLASHBOOT
-	help
-	  Select Chip for which Dataflash boot should be built
-	  Currently only AT91RM9200 Supported
-
-config BR2_TARGET_DATAFLASHBOOT_AT91RM9200
-       depends on BR2_TARGET_AT91RM9200
-	bool "AT91RM9200"
-config BR2_TARGET_DATAFLASHBOOT_AT91SAM9261
-       depends on BR2_TARGET_AT91SAM9261
-	bool "AT91SAM9261"
-config BR2_TARGET_DATAFLASHBOOT_AT91SAM9261S
-       depends on BR2_TARGET_AT91SAM9261S
-	bool "AT91SAM9261S"
-
-endchoice
diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk
deleted file mode 100644
index 8939c2897..000000000
--- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#############################################################
-#
-# DataFlashBoot
-#
-#############################################################
-DATAFLASHBOOT_VERSION:=1.05
-DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION)
-ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR))
-DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR)
-DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2
-DATAFLASHBOOT_DIR:=$(BUILD_DIR)/$(DATAFLASHBOOT_NAME)
-DATAFLASHBOOT_BINARY:=$(DATAFLASHBOOT_NAME).bin
-
-$(DL_DIR)/$(DATAFLASHBOOT_SOURCE):
-	 $(call DOWNLOAD,$(DATAFLASHBOOT_SITE),$(DATAFLASHBOOT_SOURCE))
-
-$(DATAFLASHBOOT_DIR)/.unpacked: $(DL_DIR)/$(DATAFLASHBOOT_SOURCE)
-	mkdir -p $(BUILD_DIR)
-	ls $(DL_DIR)/$(DATAFLASHBOOT_SOURCE)
-	$(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(DATAFLASHBOOT_DIR)/.unpacked
-
-$(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY): $(DATAFLASHBOOT_DIR)/.unpacked
-	ls $(DATAFLASHBOOT_DIR)/.unpacked
-	make -C $(DATAFLASHBOOT_DIR) CROSS_COMPILE=$(TARGET_CROSS)
-
-DataflashBoot-clean:
-	make -C $(DATAFLASHBOOT_DIR) clean
-
-DataflashBoot-dirclean:
-	rm -rf $(DATAFLASHBOOT_DIR)
-
-dataflash:	 $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY)
-	$(call COPY_FILE, $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY), $(TARGET_ATMEL_COPYTO),	$(BOARD_NAME)-$(DATAFLASHBOOT_BINARY))
-
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_DATAFLASHBOOT),y)
-TARGETS+=dataflash
-endif
diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in
index c5dfffd70..6de54d7a9 100644
--- a/target/device/Atmel/Makefile.in
+++ b/target/device/Atmel/Makefile.in
@@ -66,18 +66,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 ($(BR2_TARGET_UBOOT_AT91),y)
-#include $(ATMEL_PATH)/u-boot/u-boot.mk
-#endif
-
-ifeq ($(BR2_TARGET_DATAFLASHBOOT),y)
-include $(ATMEL_PATH)/DataFlashBoot/DataflashBoot.mk
-endif
-
-ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
-include $(ATMEL_PATH)/at91bootstrap/at91bootstrap.mk
-endif
-
 atmel_status:
 	@echo BUILD_DIR=$(BUILD_DIR)
 	@echo BOARD_NAME=$(BOARD_NAME)
diff --git a/target/device/Atmel/arch-arm/Makefile.in b/target/device/Atmel/arch-arm/Makefile.in
deleted file mode 100644
index e4ca5434b..000000000
--- a/target/device/Atmel/arch-arm/Makefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include target/device/Atmel/arch-arm/u-boot/Makefile.in
-
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-001-at91rm9200.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-001-at91rm9200.patch
deleted file mode 100644
index 0445b2329..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-001-at91rm9200.patch
+++ /dev/null
@@ -1,723 +0,0 @@
-diff -urN u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/at91_pio.h u-boot-2009.01/include/asm-arm/arch-at91rm9200/at91_pio.h
---- u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/at91_pio.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/include/asm-arm/arch-at91rm9200/at91_pio.h	2009-01-01 14:02:28.000000000 +0100
-@@ -0,0 +1,49 @@
-+/*
-+ * [origin: Linux kernel include/asm-arm/arch-at91/at91_pio.h]
-+ *
-+ * Copyright (C) 2005 Ivan Kokshaysky
-+ * Copyright (C) SAN People
-+ *
-+ * Parallel I/O Controller (PIO) - System peripherals registers.
-+ * Based on AT91RM9200 datasheet revision E.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef AT91_PIO_H
-+#define AT91_PIO_H
-+
-+#define PIO_PER		0x00	/* Enable Register */
-+#define PIO_PDR		0x04	/* Disable Register */
-+#define PIO_PSR		0x08	/* Status Register */
-+#define PIO_OER		0x10	/* Output Enable Register */
-+#define PIO_ODR		0x14	/* Output Disable Register */
-+#define PIO_OSR		0x18	/* Output Status Register */
-+#define PIO_IFER	0x20	/* Glitch Input Filter Enable */
-+#define PIO_IFDR	0x24	/* Glitch Input Filter Disable */
-+#define PIO_IFSR	0x28	/* Glitch Input Filter Status */
-+#define PIO_SODR	0x30	/* Set Output Data Register */
-+#define PIO_CODR	0x34	/* Clear Output Data Register */
-+#define PIO_ODSR	0x38	/* Output Data Status Register */
-+#define PIO_PDSR	0x3c	/* Pin Data Status Register */
-+#define PIO_IER		0x40	/* Interrupt Enable Register */
-+#define PIO_IDR		0x44	/* Interrupt Disable Register */
-+#define PIO_IMR		0x48	/* Interrupt Mask Register */
-+#define PIO_ISR		0x4c	/* Interrupt Status Register */
-+#define PIO_MDER	0x50	/* Multi-driver Enable Register */
-+#define PIO_MDDR	0x54	/* Multi-driver Disable Register */
-+#define PIO_MDSR	0x58	/* Multi-driver Status Register */
-+#define PIO_PUDR	0x60	/* Pull-up Disable Register */
-+#define PIO_PUER	0x64	/* Pull-up Enable Register */
-+#define PIO_PUSR	0x68	/* Pull-up Status Register */
-+#define PIO_ASR		0x70	/* Peripheral A Select Register */
-+#define PIO_BSR		0x74	/* Peripheral B Select Register */
-+#define PIO_ABSR	0x78	/* AB Status Register */
-+#define PIO_OWER	0xa0	/* Output Write Enable Register */
-+#define PIO_OWDR	0xa4	/* Output Write Disable Register */
-+#define PIO_OWSR	0xa8	/* Output Write Status Register */
-+
-+#endif
-diff -urN u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/at91_pmc.h u-boot-2009.01/include/asm-arm/arch-at91rm9200/at91_pmc.h
---- u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/at91_pmc.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/include/asm-arm/arch-at91rm9200/at91_pmc.h	2009-01-01 15:51:28.000000000 +0100
-@@ -0,0 +1,116 @@
-+/*
-+ * [origin: Linux kernel include/asm-arm/arch-at91/at91_pmc.h]
-+ *
-+ * Copyright (C) 2005 Ivan Kokshaysky
-+ * Copyright (C) SAN People
-+ *
-+ * Copyright (C) 2008 Ulf Samuelsson
-+ *
-+ * Power Management Controller (PMC) - System peripherals registers.
-+ * Based on AT91RM9200 datasheet revision E.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef AT91_PMC_H
-+#define AT91_PMC_H
-+
-+#define	AT91_PMC_SCER		(AT91_PMC + 0x00)	/* System Clock Enable Register */
-+#define	AT91_PMC_SCDR		(AT91_PMC + 0x04)	/* System Clock Disable Register */
-+
-+#define	AT91_PMC_SCSR		(AT91_PMC + 0x08)	/* System Clock Status Register */
-+#define		AT91_PMC_PCK		(1 <<  0)		/* Processor Clock */
-+#define		AT91RM9200_PMC_UDP	(1 <<  1)		/* USB Devcice Port Clock [AT91RM9200 only] */
-+#define		AT91RM9200_PMC_MCKUDP	(1 <<  2)		/* USB Device Port Master Clock Automatic Disable on Suspend [AT91RM9200 only] */
-+#define		AT91RM9200_PMC_UHP	(1 <<  4)		/* USB Host Port Clock [AT91RM9200 only] */
-+#define		AT91SAM926x_PMC_UHP	(1 <<  6)		/* USB Host Port Clock [AT91SAM926x only] */
-+#define		AT91CAP9_PMC_UHP	(1 <<  6)		/* USB Host Port Clock [AT91CAP9 only] */
-+#define		AT91SAM926x_PMC_UDP	(1 <<  7)		/* USB Devcice Port Clock [AT91SAM926x only] */
-+#define		AT91_PMC_PCK0		(1 <<  8)		/* Programmable Clock 0 */
-+#define		AT91_PMC_PCK1		(1 <<  9)		/* Programmable Clock 1 */
-+#define		AT91_PMC_PCK2		(1 << 10)		/* Programmable Clock 2 */
-+#define		AT91_PMC_PCK3		(1 << 11)		/* Programmable Clock 3 */
-+#define		AT91_PMC_HCK0		(1 << 16)		/* AHB Clock (USB host) [AT91SAM9261 only] */
-+#define		AT91_PMC_HCK1		(1 << 17)		/* AHB Clock (LCD) [AT91SAM9261 only] */
-+#define	AT91_PMC_RES_0C		(AT91_PMC + 0x0c)	/* Reserved */
-+
-+#define	AT91_PMC_PCER		(AT91_PMC + 0x10)	/* Peripheral Clock Enable Register */
-+#define	AT91_PMC_PCDR		(AT91_PMC + 0x14)	/* Peripheral Clock Disable Register */
-+#define	AT91_PMC_PCSR		(AT91_PMC + 0x18)	/* Peripheral Clock Status Register */
-+#define	AT91_PMC_RES_1C		(AT91_PMC + 0x1c)	/* Reserved */
-+
-+
-+#define	AT91_CKGR_MOR		(AT91_PMC + 0x20)	/* Main Oscillator Register [not on SAM9RL] */
-+#define		AT91_PMC_MOSCEN		(1    << 0)		/* Main Oscillator Enable */
-+#define		AT91_PMC_OSCBYPASS	(1    << 1)		/* Oscillator Bypass [AT91SAM926x only] */
-+#define		AT91_PMC_OSCOUNT	(0xff << 8)		/* Main Oscillator Start-up Time */
-+
-+#define	AT91_CKGR_MCFR		(AT91_PMC + 0x24)	/* Main Clock Frequency Register */
-+#define		AT91_PMC_MAINF		(0xffff <<  0)		/* Main Clock Frequency */
-+#define		AT91_PMC_MAINRDY	(1	<< 16)		/* Main Clock Ready */
-+
-+#define	AT91_CKGR_PLLAR		(AT91_PMC + 0x28)	/* PLL A Register */
-+#define	AT91_CKGR_PLLBR		(AT91_PMC + 0x2c)	/* PLL B Register */
-+#define		AT91_PMC_DIV		(0xff  <<  0)		/* Divider */
-+#define		AT91_PMC_PLLCOUNT	(0x3f  <<  8)		/* PLL Counter */
-+#define		AT91_PMC_OUT		(3     << 14)		/* PLL Clock Frequency Range */
-+#define		AT91_PMC_MUL		(0x7ff << 16)		/* PLL Multiplier */
-+#define		AT91_PMC_USBDIV		(3     << 28)		/* USB Divisor (PLLB only) */
-+#define			AT91_PMC_USBDIV_1		(0 << 28)
-+#define			AT91_PMC_USBDIV_2		(1 << 28)
-+#define			AT91_PMC_USBDIV_4		(2 << 28)
-+#define		AT91_PMC_USB96M		(1     << 28)		/* Divider by 2 Enable (PLLB only) */
-+
-+#define	AT91_PMC_MCKR		(AT91_PMC + 0x30)	/* Master Clock Register */
-+#define		AT91_PMC_CSS		(3 <<  0)		/* Master Clock Selection */
-+#define			AT91_PMC_CSS_SLOW		(0 << 0)
-+#define			AT91_PMC_CSS_MAIN		(1 << 0)
-+#define			AT91_PMC_CSS_PLLA		(2 << 0)
-+#define			AT91_PMC_CSS_PLLB		(3 << 0)
-+#define		AT91_PMC_PRES		(7 <<  2)		/* Master Clock Prescaler */
-+#define			AT91_PMC_PRES_1			(0 << 2)
-+#define			AT91_PMC_PRES_2			(1 << 2)
-+#define			AT91_PMC_PRES_4			(2 << 2)
-+#define			AT91_PMC_PRES_8			(3 << 2)
-+#define			AT91_PMC_PRES_16		(4 << 2)
-+#define			AT91_PMC_PRES_32		(5 << 2)
-+#define			AT91_PMC_PRES_64		(6 << 2)
-+#define		AT91_PMC_MDIV		(3 <<  8)		/* Master Clock Division */
-+#define			AT91_PMC_MDIV_1			(0 << 8)
-+#define			AT91_PMC_MDIV_2			(1 << 8)
-+#define			AT91_PMC_MDIV_3			(2 << 8)
-+#define			AT91_PMC_MDIV_4			(3 << 8)
-+
-+#define	AT91_PMC_RES_34		(AT91_PMC + 0x34)	/* Reserved */
-+#define	AT91_PMC_RES_38		(AT91_PMC + 0x38)	/* Reserved */
-+#define	AT91_PMC_RES_3C		(AT91_PMC + 0x3c)	/* Reserved */
-+
-+#define	AT91_PMC_PCKR(n)	(AT91_PMC + 0x40 + ((n) * 4))	/* Programmable Clock 0-3 Registers */
-+
-+#define	AT91_PMC_RES_50		(AT91_PMC + 0x50)	/* Reserved */
-+#define	AT91_PMC_RES_54		(AT91_PMC + 0x54)	/* Reserved */
-+#define	AT91_PMC_RES_58		(AT91_PMC + 0x58)	/* Reserved */
-+#define	AT91_PMC_RES_5C		(AT91_PMC + 0x5c)	/* Reserved */
-+
-+#define	AT91_PMC_IER		(AT91_PMC + 0x60)	/* Interrupt Enable Register */
-+#define	AT91_PMC_IDR		(AT91_PMC + 0x64)	/* Interrupt Disable Register */
-+#define	AT91_PMC_SR		(AT91_PMC + 0x68)	/* Status Register */
-+#define		AT91_PMC_MOSCS		(1 <<  0)		/* MOSCS Flag */
-+#define		AT91_PMC_LOCKA		(1 <<  1)		/* PLLA Lock */
-+#define		AT91_PMC_LOCKB		(1 <<  2)		/* PLLB Lock */
-+#define		AT91_PMC_MCKRDY		(1 <<  3)		/* Master Clock */
-+#define		AT91_PMC_PCK0RDY	(1 <<  8)		/* Programmable Clock 0 */
-+#define		AT91_PMC_PCK1RDY	(1 <<  9)		/* Programmable Clock 1 */
-+#define		AT91_PMC_PCK2RDY	(1 << 10)		/* Programmable Clock 2 */
-+#define		AT91_PMC_PCK3RDY	(1 << 11)		/* Programmable Clock 3 */
-+#define	AT91_PMC_IMR		(AT91_PMC + 0x6c)	/* Interrupt Mask Register */
-+
-+#define AT91_PMC_PROT		(AT91_PMC + 0xe4)	/* Protect Register [AT91CAP9 revC only] */
-+#define		AT91_PMC_PROTKEY	0x504d4301		/* Activation Code */
-+
-+#define AT91_PMC_VER	(AT91_PMC + 0xfc)	/* PMC Module Version [AT91CAP9 only] */
-+
-+#endif
-diff -urN u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/AT91RM9200.h u-boot-2009.01/include/asm-arm/arch-at91rm9200/AT91RM9200.h
---- u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/AT91RM9200.h	2009-01-01 13:09:34.000000000 +0100
-+++ u-boot-2009.01/include/asm-arm/arch-at91rm9200/AT91RM9200.h	2009-01-01 15:52:00.000000000 +0100
-@@ -28,6 +28,114 @@
- #ifndef __ASSEMBLY__
- typedef volatile unsigned int AT91_REG;		/* Hardware register definition */
- 
-+/*
-+ * Peripheral identifiers/interrupts.
-+ */
-+#define AT91RM9200_ID_AIC	0	/* Advanced Interrupt Controller (FIQ) */
-+#define AT91RM9200_ID_SYSIRQ	1	/* System Peripherals */
-+#define AT91RM9200_ID_PIOA	2	/* Parallel IO Controller A */
-+#define AT91RM9200_ID_PIOB	3	/* Parallel IO Controller B */
-+#define AT91RM9200_ID_PIOC	4	/* Parallel IO Controller C */
-+#define AT91RM9200_ID_PIOD	5	/* Parallel IO Controller D */
-+#define AT91RM9200_ID_US0	6	/* USART 0 */
-+#define AT91RM9200_ID_US1	7	/* USART 1 */
-+#define AT91RM9200_ID_US2	8	/* USART 2 */
-+#define AT91RM9200_ID_US3	9	/* USART 2 */
-+#define AT91RM9200_ID_MCI	10	/* Multimedia Card Interface */
-+#define AT91RM9200_ID_UDP	11	/* USB Device Port */
-+#define AT91RM9200_ID_TWI	12	/* Two-Wire Interface */
-+#define AT91RM9200_ID_SPI0	13	/* Serial Peripheral Interface 0 */
-+#define AT91RM9200_ID_SSC0	14	/* Serial Synchronous Controller */
-+#define AT91RM9200_ID_SSC1	15	/* Serial Synchronous Controller */
-+#define AT91RM9200_ID_SSC2	16	/* Serial Synchronous Controller */
-+#define AT91RM9200_ID_TC0	17	/* Timer Counter 0 */
-+#define AT91RM9200_ID_TC1	18	/* Timer Counter 1 */
-+#define AT91RM9200_ID_TC2	19	/* Timer Counter 2 */
-+#define AT91RM9200_ID_TC3	20	/* Timer Counter 3 */
-+#define AT91RM9200_ID_TC4	21	/* Timer Counter 4 */
-+#define AT91RM9200_ID_TC5	22	/* Timer Counter 5 */
-+#define AT91RM9200_ID_UHP	23	/* USB Host port */
-+#define AT91RM9200_ID_EMAC	24	/* Ethernet */
-+#define AT91RM9200_ID_IRQ0	25	/* Advanced Interrupt Controller (IRQ0) */
-+#define AT91RM9200_ID_IRQ1	26	/* Advanced Interrupt Controller (IRQ1) */
-+#define AT91RM9200_ID_IRQ2	27	/* Advanced Interrupt Controller (IRQ2) */
-+#define AT91RM9200_ID_IRQ3	28	/* Advanced Interrupt Controller (IRQ3) */
-+#define AT91RM9200_ID_IRQ4	29	/* Advanced Interrupt Controller (IRQ4) */
-+#define AT91RM9200_ID_IRQ5	30	/* Advanced Interrupt Controller (IRQ5) */
-+#define AT91RM9200_ID_IRQ6	31	/* Advanced Interrupt Controller (IRQ6) */
-+/*
-+ * User Peripheral physical base addresses.
-+ */
-+
-+
-+
-+#define AT91RM9200_BASE_TC0	0xFFFA0000 /* (TC0) Base Address */
-+#define AT91RM9200_BASE_TC1	0xFFFA4000 /* (TC0) Base Address */
-+#define AT91RM9200_BASE_UDP	0xFFFB0000 /* (TC0) Base Address */
-+#define AT91RM9200_BASE_MCI	0xFFFB4000 /* (TC0) Base Address */
-+#define AT91RM9200_BASE_TWI	0xFFFB8000 /* (TC0) Base Address */
-+#define AT91RM9200_BASE_EMAC	0xFFFBC000 /* (EMAC) Base Address */
-+#define AT91RM9200_BASE_US0	0xFFFC0000 /* (US0) Base Address */
-+#define AT91RM9200_BASE_US1	0xFFFC4000 /* (US1) Base Address */
-+#define AT91RM9200_BASE_US2	0xFFFC8000 /* (US1) Base Address */
-+#define AT91RM9200_BASE_US3	0xFFFCC000 /* (US1) Base Address */
-+#define AT91RM9200_BASE_SPI	0xFFFE0000 /* (SPI) Base Address */
-+
-+#define AT91RM9200_BASE_AIC	0xFFFFF000 /* (AIC) Base Address */
-+#define AT91RM9200_BASE_DBGU	0xFFFFF200 /* (DBGU) Base Address */
-+#define AT91RM9200_BASE_PIOA	0xFFFFF400 /* (PIOA) Base Address */
-+#define AT91RM9200_BASE_PIOB	0xFFFFF600 /* (PIOB) Base Address */
-+#define AT91RM9200_BASE_PIOC	0xFFFFF800 /* (PIOC) Base Address */
-+#define AT91RM9200_BASE_PIOD	0xFFFFFA00 /* (PIOC) Base Address */
-+#define AT91RM9200_BASE_PMC	0xFFFFFC00 /* (PMC) Base Address */
-+#define AT91RM9200_BASE_CKGR	0xFFFFFC20 /* (CKGR) Base Address */
-+#define AT91RM9200_BASE_ST	0xFFFFFD00 /* (PMC) Base Address */
-+#define AT91RM9200_BASE_RTC	0xFFFFFE00 /* (PMC) Base Address */
-+#define AT91RM9200_BASE_MC	0xFFFFFF00 /* (PMC) Base Address */
-+#define AT91RM9200_BASE_EBI	0xFFFFFF60 /* (PMC) Base Address */
-+#define AT91RM9200_BASE_SMC2	0xFFFFFF70 /* (SMC2) Base Address */
-+#define AT91RM9200_BASE_SDRAMC	0xFFFFFF90 /* (SMC2) Base Address */
-+#define AT91RM9200_BASE_BFC	0xFFFFFFC0 /* (SMC2) Base Address */
-+
-+/*
-+ * System Peripherals (offset from AT91_BASE_SYS)
-+ */
-+#define AT91_BASE_SYS		AT91RM9200_BASE_AIC
-+
-+#define AT91_AIC		(AT91RM9200_BASE_AIC	- AT91_BASE_SYS)
-+#define AT91_DBGU		(AT91RM9200_BASE_DBGU	- AT91_BASE_SYS)
-+#define AT91_PIOA		(AT91RM9200_BASE_PIOA	- AT91_BASE_SYS)
-+#define AT91_PIOB		(AT91RM9200_BASE_PIOB	- AT91_BASE_SYS)
-+#define AT91_PIOC		(AT91RM9200_BASE_PIOC	- AT91_BASE_SYS)
-+#define AT91_PIOD		(AT91RM9200_BASE_PIOD	- AT91_BASE_SYS)
-+#define AT91_PMC		(AT91RM9200_BASE_PMC	- AT91_BASE_SYS)
-+#define AT91_PMC		(AT91RM9200_BASE_PMC	- AT91_BASE_SYS)
-+#define AT91_PMC		(AT91RM9200_BASE_PMC	- AT91_BASE_SYS)
-+#define AT91_PMC		(AT91RM9200_BASE_PMC	- AT91_BASE_SYS)
-+#define AT91_PMC		(AT91RM9200_BASE_PMC	- AT91_BASE_SYS)
-+
-+#define AT91_CKGR		(AT91RM9200_BASE_CKGR	- AT91_BASE_SYS)
-+#define AT91_ST			(AT91RM9200_BASE_ST	- AT91_BASE_SYS)
-+#define AT91_RTC		(AT91RM9200_BASE_RTC	- AT91_BASE_SYS)
-+#define AT91_MC			(AT91RM9200_BASE_MC	- AT91_BASE_SYS)
-+#define AT91_EBI		(AT91RM9200_BASE_EBI	- AT91_BASE_SYS)
-+#define 	AT91_EBI_CSA		((AT91RM9200_BASE_EBI +0x00)	- AT91_BASE_SYS)
-+#define AT91_SMC2		(AT91RM9200_BASE_SMC2	- AT91_BASE_SYS)
-+#define		AT91_SMC2_CSR0		((AT91RM9200_BASE_SMC2+0x00)	- AT91_BASE_SYS)
-+#define		AT91_SMC2_CSR1		((AT91RM9200_BASE_SMC2+0x04)	- AT91_BASE_SYS)
-+#define		AT91_SMC2_CSR2		((AT91RM9200_BASE_SMC2+0x08)	- AT91_BASE_SYS)
-+#define		AT91_SMC2_CSR3		((AT91RM9200_BASE_SMC2+0x0c)	- AT91_BASE_SYS)
-+#define		AT91_SMC2_CSR4		((AT91RM9200_BASE_SMC2+0x10)	- AT91_BASE_SYS)
-+#define		AT91_SMC2_CSR5		((AT91RM9200_BASE_SMC2+0x14)	- AT91_BASE_SYS)
-+#define		AT91_SMC2_CSR6		((AT91RM9200_BASE_SMC2+0x18)	- AT91_BASE_SYS)
-+#define		AT91_SMC2_CSR7		((AT91RM9200_BASE_SMC2+0x1c)	- AT91_BASE_SYS)
-+
-+
-+#define AT91_USART0		AT91RM9200_BASE_US0
-+#define AT91_USART1		AT91RM9200_BASE_US1
-+#define AT91_USART2		AT91RM9200_BASE_US2
-+#define AT91_USART3		AT91RM9200_BASE_US3
-+
- /*****************************************************************************/
- /*        SOFTWARE API DEFINITION  FOR Timer Counter Channel Interface       */
- /*****************************************************************************/
-diff -urN u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/gpio.h u-boot-2009.01/include/asm-arm/arch-at91rm9200/gpio.h
---- u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/gpio.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/include/asm-arm/arch-at91rm9200/gpio.h	2009-01-01 14:02:11.000000000 +0100
-@@ -0,0 +1,367 @@
-+/*
-+ * [origin: Linux kernel include/asm-arm/arch-at91/gpio.h]
-+ *
-+ *  Copyright (C) 2005 HP Labs
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ */
-+
-+#ifndef __ASM_ARCH_AT91_GPIO_H
-+#define __ASM_ARCH_AT91_GPIO_H
-+
-+#include <asm/io.h>
-+#include <asm/errno.h>
-+#include <asm/arch/at91_pio.h>
-+#include <asm/arch/hardware.h>
-+
-+#define PIN_BASE		32
-+
-+#define MAX_GPIO_BANKS		5
-+
-+/* these pin numbers double as IRQ numbers, like AT91xxx_ID_* values */
-+
-+#define	AT91_PIN_PA0	(PIN_BASE + 0x00 + 0)
-+#define	AT91_PIN_PA1	(PIN_BASE + 0x00 + 1)
-+#define	AT91_PIN_PA2	(PIN_BASE + 0x00 + 2)
-+#define	AT91_PIN_PA3	(PIN_BASE + 0x00 + 3)
-+#define	AT91_PIN_PA4	(PIN_BASE + 0x00 + 4)
-+#define	AT91_PIN_PA5	(PIN_BASE + 0x00 + 5)
-+#define	AT91_PIN_PA6	(PIN_BASE + 0x00 + 6)
-+#define	AT91_PIN_PA7	(PIN_BASE + 0x00 + 7)
-+#define	AT91_PIN_PA8	(PIN_BASE + 0x00 + 8)
-+#define	AT91_PIN_PA9	(PIN_BASE + 0x00 + 9)
-+#define	AT91_PIN_PA10	(PIN_BASE + 0x00 + 10)
-+#define	AT91_PIN_PA11	(PIN_BASE + 0x00 + 11)
-+#define	AT91_PIN_PA12	(PIN_BASE + 0x00 + 12)
-+#define	AT91_PIN_PA13	(PIN_BASE + 0x00 + 13)
-+#define	AT91_PIN_PA14	(PIN_BASE + 0x00 + 14)
-+#define	AT91_PIN_PA15	(PIN_BASE + 0x00 + 15)
-+#define	AT91_PIN_PA16	(PIN_BASE + 0x00 + 16)
-+#define	AT91_PIN_PA17	(PIN_BASE + 0x00 + 17)
-+#define	AT91_PIN_PA18	(PIN_BASE + 0x00 + 18)
-+#define	AT91_PIN_PA19	(PIN_BASE + 0x00 + 19)
-+#define	AT91_PIN_PA20	(PIN_BASE + 0x00 + 20)
-+#define	AT91_PIN_PA21	(PIN_BASE + 0x00 + 21)
-+#define	AT91_PIN_PA22	(PIN_BASE + 0x00 + 22)
-+#define	AT91_PIN_PA23	(PIN_BASE + 0x00 + 23)
-+#define	AT91_PIN_PA24	(PIN_BASE + 0x00 + 24)
-+#define	AT91_PIN_PA25	(PIN_BASE + 0x00 + 25)
-+#define	AT91_PIN_PA26	(PIN_BASE + 0x00 + 26)
-+#define	AT91_PIN_PA27	(PIN_BASE + 0x00 + 27)
-+#define	AT91_PIN_PA28	(PIN_BASE + 0x00 + 28)
-+#define	AT91_PIN_PA29	(PIN_BASE + 0x00 + 29)
-+#define	AT91_PIN_PA30	(PIN_BASE + 0x00 + 30)
-+#define	AT91_PIN_PA31	(PIN_BASE + 0x00 + 31)
-+
-+#define	AT91_PIN_PB0	(PIN_BASE + 0x20 + 0)
-+#define	AT91_PIN_PB1	(PIN_BASE + 0x20 + 1)
-+#define	AT91_PIN_PB2	(PIN_BASE + 0x20 + 2)
-+#define	AT91_PIN_PB3	(PIN_BASE + 0x20 + 3)
-+#define	AT91_PIN_PB4	(PIN_BASE + 0x20 + 4)
-+#define	AT91_PIN_PB5	(PIN_BASE + 0x20 + 5)
-+#define	AT91_PIN_PB6	(PIN_BASE + 0x20 + 6)
-+#define	AT91_PIN_PB7	(PIN_BASE + 0x20 + 7)
-+#define	AT91_PIN_PB8	(PIN_BASE + 0x20 + 8)
-+#define	AT91_PIN_PB9	(PIN_BASE + 0x20 + 9)
-+#define	AT91_PIN_PB10	(PIN_BASE + 0x20 + 10)
-+#define	AT91_PIN_PB11	(PIN_BASE + 0x20 + 11)
-+#define	AT91_PIN_PB12	(PIN_BASE + 0x20 + 12)
-+#define	AT91_PIN_PB13	(PIN_BASE + 0x20 + 13)
-+#define	AT91_PIN_PB14	(PIN_BASE + 0x20 + 14)
-+#define	AT91_PIN_PB15	(PIN_BASE + 0x20 + 15)
-+#define	AT91_PIN_PB16	(PIN_BASE + 0x20 + 16)
-+#define	AT91_PIN_PB17	(PIN_BASE + 0x20 + 17)
-+#define	AT91_PIN_PB18	(PIN_BASE + 0x20 + 18)
-+#define	AT91_PIN_PB19	(PIN_BASE + 0x20 + 19)
-+#define	AT91_PIN_PB20	(PIN_BASE + 0x20 + 20)
-+#define	AT91_PIN_PB21	(PIN_BASE + 0x20 + 21)
-+#define	AT91_PIN_PB22	(PIN_BASE + 0x20 + 22)
-+#define	AT91_PIN_PB23	(PIN_BASE + 0x20 + 23)
-+#define	AT91_PIN_PB24	(PIN_BASE + 0x20 + 24)
-+#define	AT91_PIN_PB25	(PIN_BASE + 0x20 + 25)
-+#define	AT91_PIN_PB26	(PIN_BASE + 0x20 + 26)
-+#define	AT91_PIN_PB27	(PIN_BASE + 0x20 + 27)
-+#define	AT91_PIN_PB28	(PIN_BASE + 0x20 + 28)
-+#define	AT91_PIN_PB29	(PIN_BASE + 0x20 + 29)
-+#define	AT91_PIN_PB30	(PIN_BASE + 0x20 + 30)
-+#define	AT91_PIN_PB31	(PIN_BASE + 0x20 + 31)
-+
-+#define	AT91_PIN_PC0	(PIN_BASE + 0x40 + 0)
-+#define	AT91_PIN_PC1	(PIN_BASE + 0x40 + 1)
-+#define	AT91_PIN_PC2	(PIN_BASE + 0x40 + 2)
-+#define	AT91_PIN_PC3	(PIN_BASE + 0x40 + 3)
-+#define	AT91_PIN_PC4	(PIN_BASE + 0x40 + 4)
-+#define	AT91_PIN_PC5	(PIN_BASE + 0x40 + 5)
-+#define	AT91_PIN_PC6	(PIN_BASE + 0x40 + 6)
-+#define	AT91_PIN_PC7	(PIN_BASE + 0x40 + 7)
-+#define	AT91_PIN_PC8	(PIN_BASE + 0x40 + 8)
-+#define	AT91_PIN_PC9	(PIN_BASE + 0x40 + 9)
-+#define	AT91_PIN_PC10	(PIN_BASE + 0x40 + 10)
-+#define	AT91_PIN_PC11	(PIN_BASE + 0x40 + 11)
-+#define	AT91_PIN_PC12	(PIN_BASE + 0x40 + 12)
-+#define	AT91_PIN_PC13	(PIN_BASE + 0x40 + 13)
-+#define	AT91_PIN_PC14	(PIN_BASE + 0x40 + 14)
-+#define	AT91_PIN_PC15	(PIN_BASE + 0x40 + 15)
-+#define	AT91_PIN_PC16	(PIN_BASE + 0x40 + 16)
-+#define	AT91_PIN_PC17	(PIN_BASE + 0x40 + 17)
-+#define	AT91_PIN_PC18	(PIN_BASE + 0x40 + 18)
-+#define	AT91_PIN_PC19	(PIN_BASE + 0x40 + 19)
-+#define	AT91_PIN_PC20	(PIN_BASE + 0x40 + 20)
-+#define	AT91_PIN_PC21	(PIN_BASE + 0x40 + 21)
-+#define	AT91_PIN_PC22	(PIN_BASE + 0x40 + 22)
-+#define	AT91_PIN_PC23	(PIN_BASE + 0x40 + 23)
-+#define	AT91_PIN_PC24	(PIN_BASE + 0x40 + 24)
-+#define	AT91_PIN_PC25	(PIN_BASE + 0x40 + 25)
-+#define	AT91_PIN_PC26	(PIN_BASE + 0x40 + 26)
-+#define	AT91_PIN_PC27	(PIN_BASE + 0x40 + 27)
-+#define	AT91_PIN_PC28	(PIN_BASE + 0x40 + 28)
-+#define	AT91_PIN_PC29	(PIN_BASE + 0x40 + 29)
-+#define	AT91_PIN_PC30	(PIN_BASE + 0x40 + 30)
-+#define	AT91_PIN_PC31	(PIN_BASE + 0x40 + 31)
-+
-+#define	AT91_PIN_PD0	(PIN_BASE + 0x60 + 0)
-+#define	AT91_PIN_PD1	(PIN_BASE + 0x60 + 1)
-+#define	AT91_PIN_PD2	(PIN_BASE + 0x60 + 2)
-+#define	AT91_PIN_PD3	(PIN_BASE + 0x60 + 3)
-+#define	AT91_PIN_PD4	(PIN_BASE + 0x60 + 4)
-+#define	AT91_PIN_PD5	(PIN_BASE + 0x60 + 5)
-+#define	AT91_PIN_PD6	(PIN_BASE + 0x60 + 6)
-+#define	AT91_PIN_PD7	(PIN_BASE + 0x60 + 7)
-+#define	AT91_PIN_PD8	(PIN_BASE + 0x60 + 8)
-+#define	AT91_PIN_PD9	(PIN_BASE + 0x60 + 9)
-+#define	AT91_PIN_PD10	(PIN_BASE + 0x60 + 10)
-+#define	AT91_PIN_PD11	(PIN_BASE + 0x60 + 11)
-+#define	AT91_PIN_PD12	(PIN_BASE + 0x60 + 12)
-+#define	AT91_PIN_PD13	(PIN_BASE + 0x60 + 13)
-+#define	AT91_PIN_PD14	(PIN_BASE + 0x60 + 14)
-+#define	AT91_PIN_PD15	(PIN_BASE + 0x60 + 15)
-+#define	AT91_PIN_PD16	(PIN_BASE + 0x60 + 16)
-+#define	AT91_PIN_PD17	(PIN_BASE + 0x60 + 17)
-+#define	AT91_PIN_PD18	(PIN_BASE + 0x60 + 18)
-+#define	AT91_PIN_PD19	(PIN_BASE + 0x60 + 19)
-+#define	AT91_PIN_PD20	(PIN_BASE + 0x60 + 20)
-+#define	AT91_PIN_PD21	(PIN_BASE + 0x60 + 21)
-+#define	AT91_PIN_PD22	(PIN_BASE + 0x60 + 22)
-+#define	AT91_PIN_PD23	(PIN_BASE + 0x60 + 23)
-+#define	AT91_PIN_PD24	(PIN_BASE + 0x60 + 24)
-+#define	AT91_PIN_PD25	(PIN_BASE + 0x60 + 25)
-+#define	AT91_PIN_PD26	(PIN_BASE + 0x60 + 26)
-+#define	AT91_PIN_PD27	(PIN_BASE + 0x60 + 27)
-+#define	AT91_PIN_PD28	(PIN_BASE + 0x60 + 28)
-+#define	AT91_PIN_PD29	(PIN_BASE + 0x60 + 29)
-+#define	AT91_PIN_PD30	(PIN_BASE + 0x60 + 30)
-+#define	AT91_PIN_PD31	(PIN_BASE + 0x60 + 31)
-+
-+#define	AT91_PIN_PE0	(PIN_BASE + 0x80 + 0)
-+#define	AT91_PIN_PE1	(PIN_BASE + 0x80 + 1)
-+#define	AT91_PIN_PE2	(PIN_BASE + 0x80 + 2)
-+#define	AT91_PIN_PE3	(PIN_BASE + 0x80 + 3)
-+#define	AT91_PIN_PE4	(PIN_BASE + 0x80 + 4)
-+#define	AT91_PIN_PE5	(PIN_BASE + 0x80 + 5)
-+#define	AT91_PIN_PE6	(PIN_BASE + 0x80 + 6)
-+#define	AT91_PIN_PE7	(PIN_BASE + 0x80 + 7)
-+#define	AT91_PIN_PE8	(PIN_BASE + 0x80 + 8)
-+#define	AT91_PIN_PE9	(PIN_BASE + 0x80 + 9)
-+#define	AT91_PIN_PE10	(PIN_BASE + 0x80 + 10)
-+#define	AT91_PIN_PE11	(PIN_BASE + 0x80 + 11)
-+#define	AT91_PIN_PE12	(PIN_BASE + 0x80 + 12)
-+#define	AT91_PIN_PE13	(PIN_BASE + 0x80 + 13)
-+#define	AT91_PIN_PE14	(PIN_BASE + 0x80 + 14)
-+#define	AT91_PIN_PE15	(PIN_BASE + 0x80 + 15)
-+#define	AT91_PIN_PE16	(PIN_BASE + 0x80 + 16)
-+#define	AT91_PIN_PE17	(PIN_BASE + 0x80 + 17)
-+#define	AT91_PIN_PE18	(PIN_BASE + 0x80 + 18)
-+#define	AT91_PIN_PE19	(PIN_BASE + 0x80 + 19)
-+#define	AT91_PIN_PE20	(PIN_BASE + 0x80 + 20)
-+#define	AT91_PIN_PE21	(PIN_BASE + 0x80 + 21)
-+#define	AT91_PIN_PE22	(PIN_BASE + 0x80 + 22)
-+#define	AT91_PIN_PE23	(PIN_BASE + 0x80 + 23)
-+#define	AT91_PIN_PE24	(PIN_BASE + 0x80 + 24)
-+#define	AT91_PIN_PE25	(PIN_BASE + 0x80 + 25)
-+#define	AT91_PIN_PE26	(PIN_BASE + 0x80 + 26)
-+#define	AT91_PIN_PE27	(PIN_BASE + 0x80 + 27)
-+#define	AT91_PIN_PE28	(PIN_BASE + 0x80 + 28)
-+#define	AT91_PIN_PE29	(PIN_BASE + 0x80 + 29)
-+#define	AT91_PIN_PE30	(PIN_BASE + 0x80 + 30)
-+#define	AT91_PIN_PE31	(PIN_BASE + 0x80 + 31)
-+
-+static unsigned long at91_pios[] = {
-+	AT91_PIOA,
-+	AT91_PIOB,
-+	AT91_PIOC,
-+#ifdef AT91_PIOD
-+	AT91_PIOD,
-+#ifdef AT91_PIOE
-+	AT91_PIOE
-+#endif
-+#endif
-+};
-+
-+static inline void *pin_to_controller(unsigned pin)
-+{
-+	pin -= PIN_BASE;
-+	pin /= 32;
-+	return (void *)(AT91_BASE_SYS + at91_pios[pin]);
-+}
-+
-+static inline unsigned pin_to_mask(unsigned pin)
-+{
-+	pin -= PIN_BASE;
-+	return 1 << (pin % 32);
-+}
-+
-+/*
-+ * mux the pin to the "GPIO" peripheral role.
-+ */
-+static inline int at91_set_GPIO_periph(unsigned pin, int use_pullup)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+
-+	__raw_writel(mask, pio + PIO_IDR);
-+	__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
-+	__raw_writel(mask, pio + PIO_PER);
-+	return 0;
-+}
-+
-+/*
-+ * mux the pin to the "A" internal peripheral role.
-+ */
-+static inline int at91_set_A_periph(unsigned pin, int use_pullup)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+
-+	__raw_writel(mask, pio + PIO_IDR);
-+	__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
-+	__raw_writel(mask, pio + PIO_ASR);
-+	__raw_writel(mask, pio + PIO_PDR);
-+	return 0;
-+}
-+
-+/*
-+ * mux the pin to the "B" internal peripheral role.
-+ */
-+static inline int at91_set_B_periph(unsigned pin, int use_pullup)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+
-+	__raw_writel(mask, pio + PIO_IDR);
-+	__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
-+	__raw_writel(mask, pio + PIO_BSR);
-+	__raw_writel(mask, pio + PIO_PDR);
-+	return 0;
-+}
-+
-+/*
-+ * mux the pin to the gpio controller (instead of "A" or "B" peripheral), and
-+ * configure it for an input.
-+ */
-+static inline int at91_set_gpio_input(unsigned pin, int use_pullup)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+
-+	__raw_writel(mask, pio + PIO_IDR);
-+	__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
-+	__raw_writel(mask, pio + PIO_ODR);
-+	__raw_writel(mask, pio + PIO_PER);
-+	return 0;
-+}
-+
-+/*
-+ * mux the pin to the gpio controller (instead of "A" or "B" peripheral),
-+ * and configure it for an output.
-+ */
-+static inline int at91_set_gpio_output(unsigned pin, int value)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+
-+	__raw_writel(mask, pio + PIO_IDR);
-+	__raw_writel(mask, pio + PIO_PUDR);
-+	__raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
-+	__raw_writel(mask, pio + PIO_OER);
-+	__raw_writel(mask, pio + PIO_PER);
-+	return 0;
-+}
-+
-+/*
-+ * enable/disable the glitch filter; mostly used with IRQ handling.
-+ */
-+static inline int at91_set_deglitch(unsigned pin, int is_on)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+
-+	__raw_writel(mask, pio + (is_on ? PIO_IFER : PIO_IFDR));
-+	return 0;
-+}
-+
-+/*
-+ * enable/disable the multi-driver; This is only valid for output and
-+ * allows the output pin to run as an open collector output.
-+ */
-+static inline int at91_set_multi_drive(unsigned pin, int is_on)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+
-+	__raw_writel(mask, pio + (is_on ? PIO_MDER : PIO_MDDR));
-+	return 0;
-+}
-+
-+static inline int gpio_direction_input(unsigned pin)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+
-+	if (!(__raw_readl(pio + PIO_PSR) & mask))
-+		return -EINVAL;
-+	__raw_writel(mask, pio + PIO_ODR);
-+	return 0;
-+}
-+
-+static inline int gpio_direction_output(unsigned pin, int value)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+
-+	if (!(__raw_readl(pio + PIO_PSR) & mask))
-+		return -EINVAL;
-+	__raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
-+	__raw_writel(mask, pio + PIO_OER);
-+	return 0;
-+}
-+
-+/*
-+ * assuming the pin is muxed as a gpio output, set its value.
-+ */
-+static inline int at91_set_gpio_value(unsigned pin, int value)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+
-+	__raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
-+	return 0;
-+}
-+
-+/*
-+ * read the pin's value (works even if it's not muxed as a gpio).
-+ */
-+static inline int at91_get_gpio_value(unsigned pin)
-+{
-+	void		*pio = pin_to_controller(pin);
-+	unsigned	mask = pin_to_mask(pin);
-+	u32		pdsr;
-+
-+	pdsr = __raw_readl(pio + PIO_PDSR);
-+	return (pdsr & mask) != 0;
-+}
-+
-+#endif
-diff -urN u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/io.h u-boot-2009.01/include/asm-arm/arch-at91rm9200/io.h
---- u-boot-2009.01-rc1-0rig//include/asm-arm/arch-at91rm9200/io.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/include/asm-arm/arch-at91rm9200/io.h	2009-01-01 15:59:51.000000000 +0100
-@@ -0,0 +1,56 @@
-+/*
-+ * [origin: Linux kernel include/asm-arm/arch-at91/io.h]
-+ *
-+ *  Copyright (C) 2003 SAN People
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef __ASM_ARCH_IO_H
-+#define __ASM_ARCH_IO_H
-+
-+#include <asm/io.h>
-+
-+static inline unsigned int at91_sys_read(unsigned int reg_offset)
-+{
-+	void *addr = (void *)AT91_BASE_SYS;
-+
-+	return __raw_readl(addr + reg_offset);
-+}
-+
-+static inline void at91_sys_write(unsigned int reg_offset, unsigned long value)
-+{
-+	void *addr = (void *)AT91_BASE_SYS;
-+
-+	__raw_writel(value, addr + reg_offset);
-+}
-+
-+static inline void at91_sys_setbit(unsigned long value, unsigned int reg_offset)
-+{
-+	void *addr = (void *)(AT91_BASE_SYS  + reg_offset);
-+	value |= __raw_readl(addr);
-+	__raw_writel(value, addr);
-+}
-+
-+static inline void at91_sys_clrbit(unsigned long value, unsigned int reg_offset)
-+{
-+	void *addr = (void *)(AT91_BASE_SYS  + reg_offset);
-+	unsigned long data;
-+	data = __raw_readl(addr);
-+	data &= ~value;
-+	__raw_writel(data, addr);
-+}
-+
-+#endif
-
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-002-at91rm9200dk.h.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-002-at91rm9200dk.h.patch
deleted file mode 100644
index 2e7e57822..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-002-at91rm9200dk.h.patch
+++ /dev/null
@@ -1,309 +0,0 @@
-diff -urN u-boot-2009.01-rc1-0rig//include/configs/at91rm9200dk_df.h u-boot-2009.01/include/configs/at91rm9200dk_df.h
---- u-boot-2009.01-rc1-0rig//include/configs/at91rm9200dk_df.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91rm9200dk_df.h	2009-01-01 21:19:30.000000000 +0100
-@@ -0,0 +1,251 @@
-+/*
-+ * Rick Bronson <rick@efn.org>
-+ *
-+ * Configuration settings for the AT91RM9200DK board.
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#ifndef __CONFIG_H
-+#define __CONFIG_H
-+#define	AT91RM9200_BOARD	MACH_TYPE_AT91RM9200DK
-+#define	CONFIG_HOSTNAME		at91rm9200dk
-+
-+/* ARM asynchronous clock */
-+#define AT91C_MAIN_CLOCK	179712000	/* from 18.432 MHz crystal (18432000 / 4 * 39) */
-+#define AT91C_MASTER_CLOCK	59904000	/* peripheral clock (AT91C_MASTER_CLOCK / 3) */
-+/* #define AT91C_MASTER_CLOCK	44928000 */	/* peripheral clock (AT91C_MASTER_CLOCK / 4) */
-+
-+#define AT91_SLOW_CLOCK		32768	/* slow clock */
-+
-+#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-+#define	CONFIG_AT91		1	/* THis is an ARM from the AT91 family */
-+#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
-+#define CONFIG_AT91RM9200DK	1	/* on an AT91RM9200DK Board	*/
-+#undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
-+#define USE_920T_MMU		1
-+
-+#define CONFIG_SKIP_LOWLEVEL_INIT	/* Already done by dataflashboot */
-+
-+#define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
-+#define CONFIG_SETUP_MEMORY_TAGS 1
-+#define CONFIG_INITRD_TAG	1
-+
-+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_SYS_USE_MAIN_OSCILLATOR		1
-+/* flash */
-+#define MC_PUIA_VAL	0x00000000
-+#define MC_PUP_VAL	0x00000000
-+#define MC_PUER_VAL	0x00000000
-+#define MC_ASR_VAL	0x00000000
-+#define MC_AASR_VAL	0x00000000
-+#define EBI_CFGR_VAL	0x00000000
-+#define SMC_CSR0_VAL	0x00003284 /* 16bit, 2 TDF, 4 WS */
-+
-+/* clocks */
-+#define PLLAR_VAL	0x20263E04 /* 179.712000 MHz for PCK */
-+#define PLLBR_VAL	0x10483E0E /* 48.054857 MHz (divider by 2 for USB) */
-+#define MCKR_VAL	0x00000202 /* PCK/3 = MCK Master Clock = 59.904000MHz from PLLA */
-+
-+/* sdram */
-+#define PIOC_ASR_VAL	0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */
-+#define PIOC_BSR_VAL	0x00000000
-+#define PIOC_PDR_VAL	0xFFFF0000
-+#define EBI_CSA_VAL	0x00000002 /* CS1=SDRAM */
-+#define SDRC_CR_VAL	0x2188c155 /* set up the SDRAM */
-+#define SDRAM		0x20000000 /* address of the SDRAM */
-+#define SDRAM1		0x20000080 /* address of the SDRAM */
-+#define SDRAM_VAL	0x00000000 /* value written to SDRAM */
-+#define SDRC_MR_VAL	0x00000002 /* Precharge All */
-+#define SDRC_MR_VAL1	0x00000004 /* refresh */
-+#define SDRC_MR_VAL2	0x00000003 /* Load Mode Register */
-+#define SDRC_MR_VAL3	0x00000000 /* Normal Mode */
-+#define SDRC_TR_VAL	0x000002E0 /* Write refresh rate */
-+#else
-+#define CONFIG_SKIP_RELOCATE_UBOOT
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+/*
-+ * Size of malloc() pool
-+ */
-+#define CONFIG_SYS_MALLOC_LEN	(CONFIG_ENV_SIZE + 128*1024)
-+#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
-+
-+#define CONFIG_BAUDRATE 115200
-+
-+/*
-+ * Hardware drivers
-+ */
-+
-+/* define one of these to choose the DBGU, USART0  or USART1 as console */
-+#define CONFIG_DBGU
-+#undef CONFIG_USART0
-+#undef CONFIG_USART1
-+
-+#undef	CONFIG_HWFLOW			/* don't include RTS/CTS flow control support	*/
-+
-+#undef	CONFIG_MODEM_SUPPORT		/* disable modem initialization stuff */
-+
-+#define CONFIG_BOOTDELAY      3
-+/* #define CONFIG_ENV_OVERWRITE	1 */
-+
-+
-+/*
-+ * BOOTP options
-+ */
-+#define CONFIG_BOOTP_BOOTFILESIZE
-+#define CONFIG_BOOTP_BOOTPATH
-+#define CONFIG_BOOTP_GATEWAY
-+#define CONFIG_BOOTP_HOSTNAME
-+
-+
-+/*
-+ * Command line configuration.
-+ */
-+#include <config_cmd_default.h>
-+
-+#define CONFIG_CMD_DHCP
-+#define CONFIG_CMD_MII
-+#define CONFIG_CMD_NAND
-+#define CONFIG_CMD_AT91_SPIMUX
-+
-+#define CONFIG_NAND_LEGACY
-+
-+#define CONFIG_SYS_MAX_NAND_DEVICE	1	/* Max number of NAND devices		*/
-+#define SECTORSIZE 512
-+
-+#define ADDR_COLUMN 1
-+#define ADDR_PAGE 2
-+#define ADDR_COLUMN_PAGE 3
-+
-+#define NAND_ChipID_UNKNOWN	0x00
-+#define NAND_MAX_FLOORS 1
-+#define NAND_MAX_CHIPS 1
-+
-+#define AT91_SMART_MEDIA_ALE (1 << 22)	/* our ALE is AD22 */
-+#define AT91_SMART_MEDIA_CLE (1 << 21)	/* our CLE is AD21 */
-+
-+#include <asm/arch/AT91RM9200.h>	/* needed for port definitions */
-+#define NAND_DISABLE_CE(nand) do { *AT91C_PIOC_SODR = AT91C_PIO_PC0;} while(0)
-+#define NAND_ENABLE_CE(nand) do { *AT91C_PIOC_CODR = AT91C_PIO_PC0;} while(0)
-+
-+#define NAND_WAIT_READY(nand) while (!(*AT91C_PIOC_PDSR & AT91C_PIO_PC2))
-+
-+#define WRITE_NAND_COMMAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_CLE) = (__u8)(d); } while(0)
-+#define WRITE_NAND_ADDRESS(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_ALE) = (__u8)(d); } while(0)
-+#define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)d; } while(0)
-+#define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)adr))
-+/* the following are NOP's in our implementation */
-+#define NAND_CTL_CLRALE(nandptr)
-+#define NAND_CTL_SETALE(nandptr)
-+#define NAND_CTL_CLRCLE(nandptr)
-+#define NAND_CTL_SETCLE(nandptr)
-+
-+#define CONFIG_NR_DRAM_BANKS 1
-+#define PHYS_SDRAM 0x20000000
-+#define PHYS_SDRAM_SIZE 0x2000000  /* 32 megs */
-+
-+#define CONFIG_SYS_MEMTEST_START		PHYS_SDRAM
-+#define CONFIG_SYS_MEMTEST_END			CONFIG_SYS_MEMTEST_START + PHYS_SDRAM_SIZE - 262144
-+
-+#define CONFIG_DRIVER_ETHER
-+#define CONFIG_NET_RETRY_COUNT		20
-+#define CONFIG_AT91C_USE_RMII
-+
-+/* AC Characteristics */
-+/* DLYBS = tCSS = 250ns min and DLYBCT = tCSH = 250ns */
-+#define DATAFLASH_TCSS	(0xC << 16)
-+#define DATAFLASH_TCHS	(0x1 << 24)
-+
-+#define CONFIG_HAS_DATAFLASH		1
-+#define CONFIG_SYS_SPI_WRITE_TOUT		(5*CONFIG_SYS_HZ)
-+#define CONFIG_SYS_MAX_DATAFLASH_BANKS		2
-+#define CONFIG_SYS_MAX_DATAFLASH_PAGES		16384
-+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* Logical adress for CS0 */
-+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3	0xD0000000	/* Logical adress for CS3 */
-+#define CONFIG__SUPPORT_BLOCK_ERASE		1
-+
-+
-+#define PHYS_FLASH_1			0x10000000
-+#define PHYS_FLASH_SIZE			0x200000  /* 2 megs main flash */
-+#define CONFIG_SYS_FLASH_BASE			PHYS_FLASH_1
-+#define CONFIG_SYS_MAX_FLASH_BANKS		1
-+#define CONFIG_SYS_MAX_FLASH_SECT		256
-+#define CONFIG_SYS_FLASH_ERASE_TOUT		(2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
-+#define CONFIG_SYS_FLASH_WRITE_TOUT		(2*CONFIG_SYS_HZ) /* Timeout for Flash Write */
-+
-+#define	CONFIG_ENV_IS_IN_DATAFLASH	1
-+#define	CONFIG_NEW_PARTITION		1
-+
-+#ifdef CONFIG_ENV_IS_IN_DATAFLASH
-+#ifdef	CONFIG_NEW_PARTITION		
-+#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_ADDR			(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
-+#define CONFIG_ENV_SIZE			0x2000  /* 8 * 1056 really , but start.s is not OK with this*/
-+#else
-+#define CONFIG_ENV_OFFSET		0x20000
-+#define CONFIG_ENV_ADDR			(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
-+#define CONFIG_ENV_SIZE			0x2000  /* 0x8000 */
-+#endif
-+#else
-+#define CONFIG_ENV_IS_IN_FLASH		1
-+#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_ENV_ADDR			(PHYS_FLASH_1 + 0xe000)  /* between boot.bin and u-boot.bin.gz */
-+#define CONFIG_ENV_SIZE			0x2000  /* 0x8000 */
-+#else
-+#define CONFIG_ENV_ADDR			(PHYS_FLASH_1 + 0x60000)  /* after u-boot.bin */
-+#define CONFIG_ENV_SIZE			0x10000 /* sectors are 64K here */
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+#endif	/* CONFIG_ENV_IS_IN_DATAFLASH */
-+
-+#if defined(CONFIG_AT91RM9200DK)
-+#define	DATAFLASH_MMC_SELECT		AT91_PIN_PB7
-+#else
-+#define	DATAFLASH_MMC_SELECT		AT91_PIN_PB22
-+#endif
-+
-+#define CONFIG_SYS_LOAD_ADDR		0x21000000  /* default load address */
-+
-+#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_SYS_BOOT_SIZE		0x6000 /* 24 KBytes */
-+#define CONFIG_SYS_U_BOOT_BASE		(PHYS_FLASH_1 + 0x10000)
-+#define CONFIG_SYS_U_BOOT_SIZE		0x10000 /* 64 KBytes */
-+#else
-+#define CONFIG_SYS_BOOT_SIZE		0x00 /* 0 KBytes */
-+#define CONFIG_SYS_U_BOOT_BASE		PHYS_FLASH_1
-+#define CONFIG_SYS_U_BOOT_SIZE		0x60000 /* 384 KBytes */
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+
-+#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 19200, 38400, 57600, 9600 }
-+
-+#define CONFIG_SYS_PROMPT		"U-Boot> "	/* Monitor Command Prompt */
-+#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */
-+#define CONFIG_SYS_MAXARGS		16		/* max number of command args */
-+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
-+
-+#define CONFIG_SYS_HZ 1000
-+#define CONFIG_SYS_HZ_CLOCK AT91C_MASTER_CLOCK/2	/* AT91C_TC0_CMR is implicitly set to */
-+						/* AT91C_TC_TIMER_DIV1_CLOCK */
-+
-+#define CONFIG_STACKSIZE	(32*1024)	/* regular stack */
-+
-+#ifdef CONFIG_USE_IRQ
-+#error CONFIG_USE_IRQ not supported
-+#endif
-+
-+#endif
-diff -urN u-boot-2009.01-rc1-0rig//include/configs/at91rm9200dk.h u-boot-2009.01/include/configs/at91rm9200dk.h
---- u-boot-2009.01-rc1-0rig//include/configs/at91rm9200dk.h	2009-01-01 13:09:35.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91rm9200dk.h	2009-01-01 17:06:32.000000000 +0100
-@@ -24,6 +24,8 @@
- 
- #ifndef __CONFIG_H
- #define __CONFIG_H
-+#define	AT91RM9200_BOARD	MACH_TYPE_AT91RM9200DK
-+#define	CONFIG_HOSTNAME		at91rm9200dk
- 
- /* ARM asynchronous clock */
- #define AT91C_MAIN_CLOCK	179712000	/* from 18.432 MHz crystal (18432000 / 4 * 39) */
-@@ -33,6 +35,7 @@
- #define AT91_SLOW_CLOCK		32768	/* slow clock */
- 
- #define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-+#define	CONFIG_AT91		1	/* THis is an ARM from the AT91 family */
- #define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
- #define CONFIG_AT91RM9200DK	1	/* on an AT91RM9200DK Board	*/
- #undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
-@@ -117,6 +120,7 @@
- #define CONFIG_CMD_DHCP
- #define CONFIG_CMD_MII
- #define CONFIG_CMD_NAND
-+#define CONFIG_CMD_AT91_SPIMUX
- 
- #define CONFIG_NAND_LEGACY
- 
-@@ -198,6 +202,11 @@
- #endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
- #endif	/* CONFIG_ENV_IS_IN_DATAFLASH */
- 
-+#if defined(CONFIG_AT91RM9200DK)
-+#define	DATAFLASH_MMC_SELECT		AT91_PIN_PB7
-+#else
-+#define	DATAFLASH_MMC_SELECT		AT91_PIN_PB22
-+#endif
- 
- #define CONFIG_SYS_LOAD_ADDR		0x21000000  /* default load address */
- 
-diff -urN u-boot-2009.01-rc1-0rig//Makefile u-boot-2009.01/Makefile
---- u-boot-2009.01-rc1-0rig//Makefile	2009-01-01 13:09:30.000000000 +0100
-+++ u-boot-2009.01/Makefile	2009-01-01 21:35:24.000000000 +0100
-@@ -2562,6 +2562,9 @@
- ## Atmel AT91RM9200 Systems
- #########################################################################
- 
-+at91rm9200dk_df_config	:	unconfig
-+	@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
-+
- at91rm9200dk_config	:	unconfig
- 	@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
- 
-
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-003-at91rm9200dk.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-003-at91rm9200dk.patch
deleted file mode 100644
index 8f14170fa..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-003-at91rm9200dk.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-diff -urN u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/at91rm9200dk.c u-boot-2009.01/board/atmel/at91rm9200dk/at91rm9200dk.c
---- u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/at91rm9200dk.c	2009-01-01 13:09:31.000000000 +0100
-+++ u-boot-2009.01/board/atmel/at91rm9200dk/at91rm9200dk.c	2009-01-01 16:11:36.000000000 +0100
-@@ -3,6 +3,9 @@
-  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
-  * Marius Groeger <mgroeger@sysgo.de>
-  *
-+ * (C) Copyright 2008
-+ * Ulf Samuelsson <ulf.samuelsson@atmel.com>
-+ *
-  * See file CREDITS for list of people who contributed to this
-  * project.
-  *
-@@ -24,6 +27,10 @@
- 
- #include <common.h>
- #include <asm/arch/AT91RM9200.h>
-+#include <asm/arch/at91_pmc.h>
-+#include <asm/arch/at91_pio.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/io.h>
- #include <at91rm9200_net.h>
- #include <dm9161.h>
- 
-@@ -41,13 +48,13 @@
- 
- 	/* Correct IRDA resistor problem */
- 	/* Set PA23_TXD in Output */
--	((AT91PS_PIO) AT91C_BASE_PIOA)->PIO_OER = AT91C_PA23_TXD2;
-+	at91_set_gpio_output(AT91_PIN_PA23, 1);
- 
- 	/* memory and cpu-speed are setup before relocation */
- 	/* so we do _nothing_ here */
- 
- 	/* arch number of AT91RM9200DK-Board */
--	gd->bd->bi_arch_number = MACH_TYPE_AT91RM9200DK;
-+	gd->bd->bi_arch_number = AT91RM9200_BOARD;
- 	/* adress of boot parameters */
- 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
- 
-@@ -91,46 +98,58 @@
-  */
- #if defined(CONFIG_CMD_NAND)
- extern ulong nand_probe (ulong physadr);
-+/* set the bus interface characteristics based on
-+ * tDS Data Set up Time 30 - ns
-+ * tDH Data Hold Time 20 - ns
-+ * tALS ALE Set up Time 20 - ns
-+ * 16ns at 60 MHz ~= 3
-+ */
- 
--#define AT91_SMARTMEDIA_BASE 0x40000000	/* physical address to access memory on NCS3 */
--void nand_init (void)
--{
--	/* Setup Smart Media, fitst enable the address range of CS3 */
--	*AT91C_EBI_CSA |= AT91C_EBI_CS3A_SMC_SmartMedia;
--	/* set the bus interface characteristics based on
--	   tDS Data Set up Time 30 - ns
--	   tDH Data Hold Time 20 - ns
--	   tALS ALE Set up Time 20 - ns
--	   16ns at 60 MHz ~= 3  */
- /*memory mapping structures */
- #define SM_ID_RWH	(5 << 28)
- #define SM_RWH		(1 << 28)
- #define SM_RWS		(0 << 24)
- #define SM_TDF		(1 << 8)
- #define SM_NWS		(3)
--	AT91C_BASE_SMC2->SMC2_CSR[3] = (SM_RWH | SM_RWS |
--		AT91C_SMC2_ACSS_STANDARD | AT91C_SMC2_DBW_8 |
--		SM_TDF | AT91C_SMC2_WSEN | SM_NWS);
-+
-+#define	SMARTMEDIA_INIT	(			\
-+		SM_RWH |			\
-+		SM_RWS |			\
-+		AT91C_SMC2_ACSS_STANDARD |	\
-+		AT91C_SMC2_DBW_8 |		\
-+		SM_TDF |			\
-+		AT91C_SMC2_WSEN |		\
-+		SM_NWS				\
-+		)
-+
-+
-+
-+#define AT91_SMARTMEDIA_BASE 0x40000000	/* physical address to access memory on NCS3 */
-+void nand_init (void)
-+{
-+	/* Setup Smart Media, fitst enable the address range of CS3 */
-+	/* *AT91C_EBI_CSA |= AT91C_EBI_CS3A_SMC_SmartMedia; */
-+	at91_sys_setbit(AT91C_EBI_CS3A_SMC_SmartMedia, AT91_EBI_CSA);
-+
-+	/* Init Smartmedia Interface */
-+	at91_sys_write(AT91_SMC2_CSR3, SMARTMEDIA_INIT);
- 
- 	/* enable the SMOE line PC0=SMCE, A21=CLE, A22=ALE */
--	*AT91C_PIOC_ASR = AT91C_PC0_BFCK | AT91C_PC1_BFRDY_SMOE |
--		AT91C_PC3_BFBAA_SMWE;
--	*AT91C_PIOC_PDR = AT91C_PC0_BFCK | AT91C_PC1_BFRDY_SMOE |
--		AT91C_PC3_BFBAA_SMWE;
-+	at91_set_A_periph(AT91_PIN_PC0, 0);	/* BFCK	*/
-+	at91_set_A_periph(AT91_PIN_PC1, 0);	/* BFRDY/SMOE */
-+	at91_set_A_periph(AT91_PIN_PC3, 0);	/* BFBAA/SMWE */
- 
- 	/* Configure PC2 as input (signal READY of the SmartMedia) */
--	*AT91C_PIOC_PER = AT91C_PC2_BFAVD;	/* enable direct output enable */
--	*AT91C_PIOC_ODR = AT91C_PC2_BFAVD;	/* disable output */
-+	at91_set_gpio_input(AT91_PIN_PC2, 0);
- 
- 	/* Configure PB1 as input (signal Card Detect of the SmartMedia) */
--	*AT91C_PIOB_PER = AT91C_PIO_PB1;	/* enable direct output enable */
--	*AT91C_PIOB_ODR = AT91C_PIO_PB1;	/* disable output */
-+	at91_set_gpio_input(AT91_PIN_PB1, 0);
- 
- 	/* PIOB and PIOC clock enabling */
--	*AT91C_PMC_PCER = 1 << AT91C_ID_PIOB;
--	*AT91C_PMC_PCER = 1 << AT91C_ID_PIOC;
-+	at91_sys_write(AT91_PMC_PCER, 1 << AT91RM9200_ID_PIOB);
-+	at91_sys_write(AT91_PMC_PCER, 1 << AT91RM9200_ID_PIOC);
- 
--	if (*AT91C_PIOB_PDSR & AT91C_PIO_PB1)
-+	if (at91_get_gpio_value(AT91_PIN_PB1))
- 		printf ("  No SmartMedia card inserted\n");
- #ifdef DEBUG
- 	printf ("  SmartMedia card inserted\n");
-@@ -140,3 +159,4 @@
- 	printf ("%4lu MB\n", nand_probe(AT91_SMARTMEDIA_BASE) >> 20);
- }
- #endif
-+
-diff -urN u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/led.c u-boot-2009.01/board/atmel/at91rm9200dk/led.c
---- u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/led.c	2009-01-01 13:09:31.000000000 +0100
-+++ u-boot-2009.01/board/atmel/at91rm9200dk/led.c	2009-01-01 15:53:56.000000000 +0100
-@@ -24,57 +24,105 @@
- 
- #include <common.h>
- #include <asm/arch/AT91RM9200.h>
-+/*#include <asm/arch/at91_pmc.h>*/
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/io.h>
- 
--#define	GREEN_LED	AT91C_PIO_PB0
--#define	YELLOW_LED	AT91C_PIO_PB1
--#define	RED_LED	AT91C_PIO_PB2
-+#define	GREEN_LED			AT91_PIN_PB0
-+#define	YELLOW_LED			AT91_PIN_PB1
-+#define	RED_LED				AT91_PIN_PB2
- 
--void	green_LED_on(void)
-+
-+#define	GREEN_LED_ON			0
-+#define	GREEN_LED_OFF			1
-+#define	YELLOW_LED_ON			0
-+#define	YELLOW_LED_OFF			1
-+#define	RED_LED_ON			0
-+#define	RED_LED_OFF			1
-+
-+#define	TIME_SLICE			500000
-+
-+void yellow_LED_on(void)
-+{
-+	at91_set_gpio_value(YELLOW_LED, YELLOW_LED_ON);
-+}
-+
-+void yellow_LED_off(void)
-+{
-+	at91_set_gpio_value(YELLOW_LED, YELLOW_LED_OFF);
-+}
-+
-+void red_LED_on(void)
- {
--	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
--	PIOB->PIO_CODR		= GREEN_LED;
-+	at91_set_gpio_value(RED_LED, RED_LED_ON);
- }
- 
--void	 yellow_LED_on(void)
-+void red_LED_off(void)
- {
--	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
--	PIOB->PIO_CODR		= YELLOW_LED;
-+	at91_set_gpio_value(RED_LED, RED_LED_OFF);
- }
- 
--void	 red_LED_on(void)
-+void green_LED_on(void)
- {
--	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
--	PIOB->PIO_CODR		= RED_LED;
-+	at91_set_gpio_value(GREEN_LED, GREEN_LED_ON);
- }
- 
--void	green_LED_off(void)
-+void green_LED_off(void)
- {
--	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
--	PIOB->PIO_SODR		= GREEN_LED;
-+	at91_set_gpio_value(GREEN_LED, GREEN_LED_OFF);
- }
- 
--void	yellow_LED_off(void)
-+static void	delay(unsigned int	time)
- {
--	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
--	PIOB->PIO_SODR		= YELLOW_LED;
-+	volatile unsigned int	counter = time;
-+	while(counter > 0) counter--;
- }
- 
--void	red_LED_off(void)
-+void	green_LED_blink(unsigned int time)
- {
--	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
--	PIOB->PIO_SODR		= RED_LED;
-+	while(time > 0) {
-+		green_LED_on();
-+		delay(TIME_SLICE);
-+		green_LED_off();
-+		delay(TIME_SLICE);
-+		time--;
-+	}
- }
- 
-+void	yellow_LED_blink(unsigned int time)
-+{
-+	while(time > 0) {
-+		yellow_LED_on();
-+		delay(TIME_SLICE);
-+		yellow_LED_off();
-+		delay(TIME_SLICE);
-+		time--;
-+	}
-+}
- 
--void coloured_LED_init (void)
-+void	red_LED_blink(unsigned int time)
- {
--	AT91PS_PIO	PIOB	= AT91C_BASE_PIOB;
--	AT91PS_PMC	PMC	= AT91C_BASE_PMC;
--	PMC->PMC_PCER		= (1 << AT91C_ID_PIOB);	/* Enable PIOB clock */
--	/* Disable peripherals on LEDs */
--	PIOB->PIO_PER		= AT91C_PIO_PB2 | AT91C_PIO_PB1 | AT91C_PIO_PB0;
--	/* Enable pins as outputs */
--	PIOB->PIO_OER		= AT91C_PIO_PB2 | AT91C_PIO_PB1 | AT91C_PIO_PB0;
--	/* Turn all LEDs OFF */
--	PIOB->PIO_SODR		= AT91C_PIO_PB2 | AT91C_PIO_PB1 | AT91C_PIO_PB0;
-+	while(time > 0) {
-+		red_LED_on();
-+		delay(TIME_SLICE);
-+		red_LED_off();
-+		delay(TIME_SLICE);
-+		time--;
-+	}
- }
-+
-+void coloured_LED_init(void)
-+{
-+	/* Enable clock */
-+	at91_sys_write(AT91C_PMC_PCER, 1 << AT91RM9200_ID_PIOB);
-+
-+	at91_set_gpio_output(GREEN_LED, 1);
-+	at91_set_gpio_output(YELLOW_LED, 1);
-+	at91_set_gpio_output(RED_LED, 1);
-+
-+	at91_set_gpio_value(GREEN_LED,	GREEN_LED_OFF);
-+	at91_set_gpio_value(YELLOW_LED, YELLOW_LED_OFF);
-+	at91_set_gpio_value(RED_LED,	RED_LED_ON);
-+}
-+
-+
-diff -urN u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/mux.c u-boot-2009.01/board/atmel/at91rm9200dk/mux.c
---- u-boot-2009.01-rc1-0rig//board/atmel/at91rm9200dk/mux.c	2009-01-01 13:09:31.000000000 +0100
-+++ u-boot-2009.01/board/atmel/at91rm9200dk/mux.c	2009-01-01 16:38:01.000000000 +0100
-@@ -1,37 +1,29 @@
- #include <config.h>
- #include <common.h>
- #include <asm/hardware.h>
-+#include <asm/arch/at91_pio.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/io.h>
- #include <dataflash.h>
- 
- int AT91F_GetMuxStatus(void) {
--#ifdef	DATAFLASH_MMC_SELECT
--	AT91C_BASE_PIOB->PIO_PER = DATAFLASH_MMC_SELECT; /* Set in PIO mode */
--	AT91C_BASE_PIOB->PIO_OER = DATAFLASH_MMC_SELECT; /* Configure in output */
--
--
--	if(AT91C_BASE_PIOB->PIO_ODSR & DATAFLASH_MMC_SELECT) {
--		return 1;
--	} else {
--		return 0;
--	}
--#endif
-+#ifdef	CONFIG_CMD_AT91_SPIMUX
-+	return at91_get_gpio_value(DATAFLASH_MMC_SELECT);
-+#else
- 	return 0;
-+#endif
- }
- 
--void AT91F_SelectMMC(void) {
--#ifdef	DATAFLASH_MMC_SELECT
--	AT91C_BASE_PIOB->PIO_PER = DATAFLASH_MMC_SELECT;	/* Set in PIO mode */
--	AT91C_BASE_PIOB->PIO_OER = DATAFLASH_MMC_SELECT;	/* Configure in output */
--	/* Set Output */
--	AT91C_BASE_PIOB->PIO_SODR = DATAFLASH_MMC_SELECT;
-+void AT91F_SelectMMC(void) 
-+{
-+#ifdef	CONFIG_CMD_AT91_SPIMUX
-+	at91_set_gpio_output(DATAFLASH_MMC_SELECT, 1);	/* Set in PIO mode and select SD-Card*/
- #endif
- }
- 
- void AT91F_SelectSPI(void) {
--#ifdef	DATAFLASH_MMC_SELECT
--	AT91C_BASE_PIOB->PIO_PER = DATAFLASH_MMC_SELECT;	/* Set in PIO mode */
--	AT91C_BASE_PIOB->PIO_OER = DATAFLASH_MMC_SELECT;	/* Configure in output */
--	/* Clear Output */
--	AT91C_BASE_PIOB->PIO_CODR = DATAFLASH_MMC_SELECT;
-+#ifdef	CONFIG_CMD_AT91_SPIMUX
-+	at91_set_gpio_output(DATAFLASH_MMC_SELECT, 0);	/* Set in PIO mode and select SPI */
- #endif
- }
-+
-
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-004-at91rm9200ek.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-004-at91rm9200ek.patch
deleted file mode 100644
index 4d22c5334..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-004-at91rm9200ek.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-diff -urN u-boot-2009.01-0rig/include/configs/at91rm9200df.h u-boot-2009.01/include/configs/at91rm9200df.h
---- u-boot-2009.01-0rig/include/configs/at91rm9200df.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91rm9200df.h	2009-01-01 21:19:17.000000000 +0100
-@@ -0,0 +1,261 @@
-+/*
-+ * Rick Bronson <rick@efn.org>
-+ *
-+ * Ulf Samuelsson <ulf.samuelsson@atmel.com>
-+ *
-+ * Configuration settings for the AT91RM9200EK board.
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#ifndef __CONFIG_H
-+#define __CONFIG_H
-+#define	AT91RM9200_BOARD	MACH_TYPE_AT91RM9200DF
-+#define	CONFIG_HOSTNAME		at91rm9200df
-+/* ARM asynchronous clock */
-+#define AT91C_MAIN_CLOCK	179712000	/* from 18.432 MHz crystal (18432000 / 4 * 39) */
-+#define AT91C_MASTER_CLOCK	59904000	/* peripheral clock (AT91C_MASTER_CLOCK / 3) */
-+/* #define AT91C_MASTER_CLOCK	44928000 */	/* peripheral clock (AT91C_MASTER_CLOCK / 4) */
-+
-+#define AT91_SLOW_CLOCK		32768	/* slow clock */
-+
-+#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-+#define	CONFIG_AT91		1	/* THis is an ARM from the AT91 family */
-+#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
-+#define CONFIG_AT91RM9200DF	1	/* Generic AT91RM9200 Board running from Dataflashcard	*/
-+#undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
-+#define USE_920T_MMU		1
-+
-+#define CONFIG_SKIP_LOWLEVEL_INIT	/* Already done by dataflashboot */
-+
-+#define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
-+#define CONFIG_SETUP_MEMORY_TAGS 1
-+#define CONFIG_INITRD_TAG	1
-+
-+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_SYS_USE_MAIN_OSCILLATOR		1
-+/* flash */
-+#define MC_PUIA_VAL	0x00000000
-+#define MC_PUP_VAL	0x00000000
-+#define MC_PUER_VAL	0x00000000
-+#define MC_ASR_VAL	0x00000000
-+#define MC_AASR_VAL	0x00000000
-+#define EBI_CFGR_VAL	0x00000000
-+#define SMC_CSR0_VAL	0x00003284 /* 16bit, 2 TDF, 4 WS */
-+
-+/* clocks */
-+#define PLLAR_VAL	0x20263E04 /* 179.712000 MHz for PCK */
-+#define PLLBR_VAL	0x10483E0E /* 48.054857 MHz (divider by 2 for USB) */
-+#define MCKR_VAL	0x00000202 /* PCK/3 = MCK Master Clock = 59.904000MHz from PLLA */
-+
-+/* sdram */
-+#define PIOC_ASR_VAL	0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */
-+#define PIOC_BSR_VAL	0x00000000
-+#define PIOC_PDR_VAL	0xFFFF0000
-+#define EBI_CSA_VAL	0x00000002 /* CS1=SDRAM */
-+#define SDRC_CR_VAL	0x2188c155 /* set up the SDRAM */
-+#define SDRAM		0x20000000 /* address of the SDRAM */
-+#define SDRAM1		0x20000080 /* address of the SDRAM */
-+#define SDRAM_VAL	0x00000000 /* value written to SDRAM */
-+#define SDRC_MR_VAL	0x00000002 /* Precharge All */
-+#define SDRC_MR_VAL1	0x00000004 /* refresh */
-+#define SDRC_MR_VAL2	0x00000003 /* Load Mode Register */
-+#define SDRC_MR_VAL3	0x00000000 /* Normal Mode */
-+#define SDRC_TR_VAL	0x000002E0 /* Write refresh rate */
-+#else
-+#define CONFIG_SKIP_RELOCATE_UBOOT
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+/*
-+ * Size of malloc() pool
-+ */
-+#define CONFIG_SYS_MALLOC_LEN	(CONFIG_ENV_SIZE + 128*1024)
-+#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
-+
-+#define CONFIG_BAUDRATE 115200
-+
-+/*
-+ * Hardware drivers
-+ */
-+
-+/* define one of these to choose the DBGU, USART0  or USART1 as console */
-+#define CONFIG_DBGU
-+#undef CONFIG_USART0
-+#undef CONFIG_USART1
-+
-+#undef	CONFIG_HWFLOW			/* don't include RTS/CTS flow control support	*/
-+
-+#undef	CONFIG_MODEM_SUPPORT		/* disable modem initialization stuff */
-+
-+#define CONFIG_BOOTDELAY      3
-+/* #define CONFIG_ENV_OVERWRITE	1 */
-+
-+
-+/*
-+ * BOOTP options
-+ */
-+#define CONFIG_BOOTP_BOOTFILESIZE
-+#define CONFIG_BOOTP_BOOTPATH
-+#define CONFIG_BOOTP_GATEWAY
-+#define CONFIG_BOOTP_HOSTNAME
-+
-+
-+/*
-+ * Command line configuration.
-+ */
-+#include <config_cmd_default.h>
-+
-+#define CONFIG_CMD_DHCP
-+#define CONFIG_CMD_MII
-+#define CONFIG_CMD_NAND
-+#define CONFIG_CMD_AT91_SPIMUX
-+#define CONFIG_CMD_ETHINIT
-+
-+#define CONFIG_DOS_PARTITION		1
-+#define CONFIG_MMC			1
-+#define CONFIG_SUPPORT_VFAT		1
-+#define CONFIG__MMC_BASE			0xFFFB4000	/* From AT91RM9200.h*/
-+#define CONFIG__MMC_BLOCKSIZE		512
-+
-+#define CONFIG_NAND_LEGACY
-+
-+#define CONFIG_SYS_MAX_NAND_DEVICE	1	/* Max number of NAND devices		*/
-+#define SECTORSIZE 512
-+
-+#define ADDR_COLUMN 1
-+#define ADDR_PAGE 2
-+#define ADDR_COLUMN_PAGE 3
-+
-+#define NAND_ChipID_UNKNOWN	0x00
-+#define NAND_MAX_FLOORS 1
-+#define NAND_MAX_CHIPS 1
-+
-+#define AT91_SMART_MEDIA_ALE (1 << 22)	/* our ALE is AD22 */
-+#define AT91_SMART_MEDIA_CLE (1 << 21)	/* our CLE is AD21 */
-+
-+#include <asm/arch/AT91RM9200.h>	/* needed for port definitions */
-+#define NAND_DISABLE_CE(nand) do { *AT91C_PIOC_SODR = AT91C_PIO_PC0;} while(0)
-+#define NAND_ENABLE_CE(nand) do { *AT91C_PIOC_CODR = AT91C_PIO_PC0;} while(0)
-+
-+#define NAND_WAIT_READY(nand) while (!(*AT91C_PIOC_PDSR & AT91C_PIO_PC2))
-+
-+#define WRITE_NAND_COMMAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_CLE) = (__u8)(d); } while(0)
-+#define WRITE_NAND_ADDRESS(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_ALE) = (__u8)(d); } while(0)
-+#define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)d; } while(0)
-+#define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)adr))
-+/* the following are NOP's in our implementation */
-+#define NAND_CTL_CLRALE(nandptr)
-+#define NAND_CTL_SETALE(nandptr)
-+#define NAND_CTL_CLRCLE(nandptr)
-+#define NAND_CTL_SETCLE(nandptr)
-+
-+#define CONFIG_NR_DRAM_BANKS 1
-+#define PHYS_SDRAM 0x20000000
-+#define PHYS_SDRAM_SIZE 0x2000000  /* 32 megs */
-+
-+#define CONFIG_SYS_MEMTEST_START		PHYS_SDRAM
-+#define CONFIG_SYS_MEMTEST_END			CONFIG_SYS_MEMTEST_START + PHYS_SDRAM_SIZE - 262144
-+
-+#define CONFIG_DRIVER_ETHER
-+#define CONFIG_NET_RETRY_COUNT		20
-+#define CONFIG_AT91C_USE_RMII
-+
-+/* AC Characteristics */
-+/* DLYBS = tCSS = 250ns min and DLYBCT = tCSH = 250ns */
-+#define DATAFLASH_TCSS	(0xC << 16)
-+#define DATAFLASH_TCHS	(0x1 << 24)
-+
-+#define CONFIG_HAS_DATAFLASH		1
-+#undef BOARD_LATE_INIT
-+
-+#define CONFIG_SYS_SPI_WRITE_TOUT		(5*CONFIG_SYS_HZ)
-+#define CONFIG_SYS_MAX_DATAFLASH_BANKS		2
-+#define CONFIG_SYS_MAX_DATAFLASH_PAGES		16384
-+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* Logical adress for CS0 */
-+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3	0xD0000000	/* Logical adress for CS3 */
-+#define CONFIG__SUPPORT_BLOCK_ERASE		1
-+
-+#define PHYS_FLASH_1			0x10000000
-+#define PHYS_FLASH_SIZE			0x800000  /* 2 megs main flash */
-+#define CONFIG_SYS_FLASH_BASE			PHYS_FLASH_1
-+#define CONFIG_SYS_MAX_FLASH_BANKS		1
-+#define CONFIG_SYS_MAX_FLASH_SECT		256
-+#define CONFIG_SYS_FLASH_ERASE_TOUT		(2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
-+#define CONFIG_SYS_FLASH_WRITE_TOUT		(2*CONFIG_SYS_HZ) /* Timeout for Flash Write */
-+
-+#define	CONFIG_ENV_IS_IN_DATAFLASH
-+#define	CONFIG_NEW_PARTITION		1
-+
-+#ifdef CONFIG_ENV_IS_IN_DATAFLASH
-+#ifdef	CONFIG_NEW_PARTITION		
-+#define CONFIG_ENV_OFFSET		0x21000
-+#define CONFIG_ENV_ADDR			(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
-+#define CONFIG_ENV_SIZE			0x2000  /* 8 * 1056 really , but start.s is not OK with this*/
-+#else
-+#define CONFIG_ENV_OFFSET		0x20000
-+#define CONFIG_ENV_ADDR			(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
-+#define CONFIG_ENV_SIZE			0x2000  /* 0x8000 */
-+#endif
-+#else
-+#define CONFIG_ENV_IS_IN_FLASH		1
-+#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_ENV_ADDR			(PHYS_FLASH_1 + 0xe000)  /* between boot.bin and u-boot.bin.gz */
-+#define CONFIG_ENV_SIZE			0x2000  /* 0x8000 */
-+#else
-+#define CONFIG_ENV_ADDR			(PHYS_FLASH_1 + 0x60000)  /* after u-boot.bin */
-+#define CONFIG_ENV_SIZE			0x10000 /* sectors are 64K here */
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+#endif	/* CONFIG_ENV_IS_IN_DATAFLASH */
-+
-+#if defined(CONFIG_AT91RM9200DK)
-+#define	DATAFLASH_MMC_SELECT		AT91_PIN_PB7
-+#else
-+#define	DATAFLASH_MMC_SELECT		AT91_PIN_PB22
-+#endif
-+
-+#define CONFIG_SYS_LOAD_ADDR		0x21000000  /* default load address */
-+
-+#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_SYS_BOOT_SIZE		0x6000 /* 24 KBytes */
-+#define CONFIG_SYS_U_BOOT_BASE		(PHYS_FLASH_1 + 0x10000)
-+#define CONFIG_SYS_U_BOOT_SIZE		0x10000 /* 64 KBytes */
-+#else
-+#define CONFIG_SYS_BOOT_SIZE		0x00 /* 0 KBytes */
-+#define CONFIG_SYS_U_BOOT_BASE		PHYS_FLASH_1
-+#define CONFIG_SYS_U_BOOT_SIZE		0x60000 /* 384 KBytes */
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+
-+#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 19200, 38400, 57600, 9600 }
-+
-+#define CONFIG_SYS_PROMPT		"U-Boot> "	/* Monitor Command Prompt */
-+#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */
-+#define CONFIG_SYS_MAXARGS		16		/* max number of command args */
-+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
-+
-+#define CONFIG_SYS_HZ 1000
-+#define CONFIG_SYS_HZ_CLOCK AT91C_MASTER_CLOCK/2	/* AT91C_TC0_CMR is implicitly set to */
-+						/* AT91C_TC_TIMER_DIV1_CLOCK */
-+
-+#define CONFIG_STACKSIZE		(32*1024)	/* regular stack */
-+#define CONFIG_STACKSIZE_IRQ  		(4*1024)        /* IRQ stack */
-+#define CONFIG_STACKSIZE_FIQ  		(4*1024) 
-+
-+#ifdef CONFIG_USE_IRQ
-+#error CONFIG_USE_IRQ not supported
-+#endif
-+#endif
-diff -urN u-boot-2009.01-0rig/include/configs/at91rm9200ek.h u-boot-2009.01/include/configs/at91rm9200ek.h
---- u-boot-2009.01-0rig/include/configs/at91rm9200ek.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91rm9200ek.h	2009-01-01 17:13:31.000000000 +0100
-@@ -0,0 +1,251 @@
-+/*
-+ * Rick Bronson <rick@efn.org>
-+ *
-+ * Ulf Samuelsson <ulf.samuelsson@atmel.com>
-+ *
-+ * Configuration settings for the AT91RM9200EK board.
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#ifndef __CONFIG_H
-+#define __CONFIG_H
-+#define	AT91RM9200_BOARD	MACH_TYPE_AT91RM9200EK
-+#define	CONFIG_HOSTNAME		at91rm9200ek
-+/* ARM asynchronous clock */
-+#define AT91C_MAIN_CLOCK	179712000	/* from 18.432 MHz crystal (18432000 / 4 * 39) */
-+#define AT91C_MASTER_CLOCK	59904000	/* peripheral clock (AT91C_MASTER_CLOCK / 3) */
-+/* #define AT91C_MASTER_CLOCK	44928000 */	/* peripheral clock (AT91C_MASTER_CLOCK / 4) */
-+
-+#define AT91_SLOW_CLOCK		32768	/* slow clock */
-+
-+#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-+#define	CONFIG_AT91		1	/* THis is an ARM from the AT91 family */
-+#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
-+#define CONFIG_AT91RM9200EK	1	/* on an AT91RM9200EK Board	*/
-+#undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
-+#define USE_920T_MMU		1
-+
-+#define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
-+#define CONFIG_SETUP_MEMORY_TAGS 1
-+#define CONFIG_INITRD_TAG	1
-+
-+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_SYS_USE_MAIN_OSCILLATOR		1
-+/* flash */
-+#define MC_PUIA_VAL	0x00000000
-+#define MC_PUP_VAL	0x00000000
-+#define MC_PUER_VAL	0x00000000
-+#define MC_ASR_VAL	0x00000000
-+#define MC_AASR_VAL	0x00000000
-+#define EBI_CFGR_VAL	0x00000000
-+#define SMC_CSR0_VAL	0x00003284 /* 16bit, 2 TDF, 4 WS */
-+
-+/* clocks */
-+#define PLLAR_VAL	0x20263E04 /* 179.712000 MHz for PCK */
-+#define PLLBR_VAL	0x10483E0E /* 48.054857 MHz (divider by 2 for USB) */
-+#define MCKR_VAL	0x00000202 /* PCK/3 = MCK Master Clock = 59.904000MHz from PLLA */
-+
-+/* sdram */
-+#define PIOC_ASR_VAL	0xFFFF0000 /* Configure PIOC as peripheral (D16/D31) */
-+#define PIOC_BSR_VAL	0x00000000
-+#define PIOC_PDR_VAL	0xFFFF0000
-+#define EBI_CSA_VAL	0x00000002 /* CS1=SDRAM */
-+#define SDRC_CR_VAL	0x2188c155 /* set up the SDRAM */
-+#define SDRAM		0x20000000 /* address of the SDRAM */
-+#define SDRAM1		0x20000080 /* address of the SDRAM */
-+#define SDRAM_VAL	0x00000000 /* value written to SDRAM */
-+#define SDRC_MR_VAL	0x00000002 /* Precharge All */
-+#define SDRC_MR_VAL1	0x00000004 /* refresh */
-+#define SDRC_MR_VAL2	0x00000003 /* Load Mode Register */
-+#define SDRC_MR_VAL3	0x00000000 /* Normal Mode */
-+#define SDRC_TR_VAL	0x000002E0 /* Write refresh rate */
-+#else
-+#define CONFIG_SKIP_RELOCATE_UBOOT
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+/*
-+ * Size of malloc() pool
-+ */
-+#define CONFIG_SYS_MALLOC_LEN	(CONFIG_ENV_SIZE + 128*1024)
-+#define CONFIG_SYS_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
-+
-+#define CONFIG_BAUDRATE 115200
-+
-+/*
-+ * Hardware drivers
-+ */
-+
-+/* define one of these to choose the DBGU, USART0  or USART1 as console */
-+#define CONFIG_DBGU
-+#undef CONFIG_USART0
-+#undef CONFIG_USART1
-+
-+#undef	CONFIG_HWFLOW			/* don't include RTS/CTS flow control support	*/
-+
-+#undef	CONFIG_MODEM_SUPPORT		/* disable modem initialization stuff */
-+
-+#define CONFIG_BOOTDELAY      3
-+/* #define CONFIG_ENV_OVERWRITE	1 */
-+
-+
-+/*
-+ * BOOTP options
-+ */
-+#define CONFIG_BOOTP_BOOTFILESIZE
-+#define CONFIG_BOOTP_BOOTPATH
-+#define CONFIG_BOOTP_GATEWAY
-+#define CONFIG_BOOTP_HOSTNAME
-+
-+
-+/*
-+ * Command line configuration.
-+ */
-+#include <config_cmd_default.h>
-+
-+#define CONFIG_CMD_DHCP
-+#define CONFIG_CMD_MII
-+#define CONFIG_CMD_NAND
-+#define CONFIG_CMD_AT91_SPIMUX
-+#define CONFIG_CMD_ETHINIT
-+
-+#define CONFIG_NAND_LEGACY
-+
-+#define CONFIG_SYS_MAX_NAND_DEVICE	1	/* Max number of NAND devices		*/
-+#define SECTORSIZE 512
-+
-+#define ADDR_COLUMN 1
-+#define ADDR_PAGE 2
-+#define ADDR_COLUMN_PAGE 3
-+
-+#define NAND_ChipID_UNKNOWN	0x00
-+#define NAND_MAX_FLOORS 1
-+#define NAND_MAX_CHIPS 1
-+
-+#define AT91_SMART_MEDIA_ALE (1 << 22)	/* our ALE is AD22 */
-+#define AT91_SMART_MEDIA_CLE (1 << 21)	/* our CLE is AD21 */
-+
-+#include <asm/arch/AT91RM9200.h>	/* needed for port definitions */
-+#define NAND_DISABLE_CE(nand) do { *AT91C_PIOC_SODR = AT91C_PIO_PC0;} while(0)
-+#define NAND_ENABLE_CE(nand) do { *AT91C_PIOC_CODR = AT91C_PIO_PC0;} while(0)
-+
-+#define NAND_WAIT_READY(nand) while (!(*AT91C_PIOC_PDSR & AT91C_PIO_PC2))
-+
-+#define WRITE_NAND_COMMAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_CLE) = (__u8)(d); } while(0)
-+#define WRITE_NAND_ADDRESS(d, adr) do{ *(volatile __u8 *)((unsigned long)adr | AT91_SMART_MEDIA_ALE) = (__u8)(d); } while(0)
-+#define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)adr) = (__u8)d; } while(0)
-+#define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)adr))
-+/* the following are NOP's in our implementation */
-+#define NAND_CTL_CLRALE(nandptr)
-+#define NAND_CTL_SETALE(nandptr)
-+#define NAND_CTL_CLRCLE(nandptr)
-+#define NAND_CTL_SETCLE(nandptr)
-+
-+#define CONFIG_NR_DRAM_BANKS 1
-+#define PHYS_SDRAM 0x20000000
-+#define PHYS_SDRAM_SIZE 0x2000000  /* 32 megs */
-+
-+#define CONFIG_SYS_MEMTEST_START		PHYS_SDRAM
-+#define CONFIG_SYS_MEMTEST_END			CONFIG_SYS_MEMTEST_START + PHYS_SDRAM_SIZE - 262144
-+
-+#define CONFIG_DRIVER_ETHER
-+#define CONFIG_NET_RETRY_COUNT		20
-+#define CONFIG_AT91C_USE_RMII
-+
-+/* AC Characteristics */
-+/* DLYBS = tCSS = 250ns min and DLYBCT = tCSH = 250ns */
-+#define DATAFLASH_TCSS	(0xC << 16)
-+#define DATAFLASH_TCHS	(0x1 << 24)
-+
-+#define CONFIG_HAS_DATAFLASH		1
-+#define CONFIG_SYS_SPI_WRITE_TOUT		(5*CONFIG_SYS_HZ)
-+#define CONFIG_SYS_MAX_DATAFLASH_BANKS		2
-+#define CONFIG_SYS_MAX_DATAFLASH_PAGES		16384
-+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* Logical adress for CS0 */
-+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3	0xD0000000	/* Logical adress for CS3 */
-+#define CONFIG__SUPPORT_BLOCK_ERASE		1
-+
-+#define PHYS_FLASH_1			0x10000000
-+#define PHYS_FLASH_SIZE			0x800000  /* 2 megs main flash */
-+#define CONFIG_SYS_FLASH_BASE			PHYS_FLASH_1
-+#define CONFIG_SYS_MAX_FLASH_BANKS		1
-+#define CONFIG_SYS_MAX_FLASH_SECT		256
-+#define CONFIG_SYS_FLASH_ERASE_TOUT		(2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
-+#define CONFIG_SYS_FLASH_WRITE_TOUT		(2*CONFIG_SYS_HZ) /* Timeout for Flash Write */
-+
-+#undef	CONFIG_ENV_IS_IN_DATAFLASH
-+#define	CONFIG_NEW_PARTITION		1
-+
-+#ifdef CONFIG_ENV_IS_IN_DATAFLASH
-+#ifdef	CONFIG_NEW_PARTITION		
-+#define CONFIG__ENV_OFFSET			0x21000
-+#define CONFIG__ENV_ADDR			(CONFIG_SYS__DATAFLASH_LOGIC_ADDR_CS0 + CONFIG__ENV_OFFSET)
-+#define CONFIG__ENV_SIZE			0x2000  /* 8 * 1056 really , but start.s is not OK with this*/
-+> #else
-+#define CONFIG_ENV_OFFSET		0x20000
-+#define CONFIG_ENV_ADDR			(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
-+#define CONFIG_ENV_SIZE			0x2000  /* 0x8000 */
-+#endif
-+#else
-+#define CONFIG_ENV_IS_IN_FLASH		1
-+#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_ENV_ADDR			(PHYS_FLASH_1 + 0xe000)  /* between boot.bin and u-boot.bin.gz */
-+#define CONFIG_ENV_SIZE			0x2000  /* 0x8000 */
-+#else
-+#define CONFIG_ENV_ADDR			(PHYS_FLASH_1 + 0x60000)  /* after u-boot.bin */
-+#define CONFIG_ENV_SIZE			0x10000 /* sectors are 64K here */
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+#endif	/* CONFIG_ENV_IS_IN_DATAFLASH */
-+
-+#if defined(CONFIG_AT91RM9200DK)
-+#define	DATAFLASH_MMC_SELECT		AT91_PIN_PB7
-+#else
-+#define	DATAFLASH_MMC_SELECT		AT91_PIN_PB22
-+#endif
-+
-+#define CONFIG_SYS_LOAD_ADDR		0x21000000  /* default load address */
-+
-+#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_SYS_BOOT_SIZE		0x6000 /* 24 KBytes */
-+#define CONFIG_SYS_U_BOOT_BASE		(PHYS_FLASH_1 + 0x10000)
-+#define CONFIG_SYS_U_BOOT_SIZE		0x10000 /* 64 KBytes */
-+#else
-+#define CONFIG_SYS_BOOT_SIZE		0x00 /* 0 KBytes */
-+#define CONFIG_SYS_U_BOOT_BASE		PHYS_FLASH_1
-+#define CONFIG_SYS_U_BOOT_SIZE		0x60000 /* 384 KBytes */
-+#endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-+
-+#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 19200, 38400, 57600, 9600 }
-+
-+#define CONFIG_SYS_PROMPT		"U-Boot> "	/* Monitor Command Prompt */
-+#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */
-+#define CONFIG_SYS_MAXARGS		16		/* max number of command args */
-+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
-+
-+#define CONFIG_SYS_HZ 1000
-+#define CONFIG_SYS_HZ_CLOCK AT91C_MASTER_CLOCK/2	/* AT91C_TC0_CMR is implicitly set to */
-+						/* AT91C_TC_TIMER_DIV1_CLOCK */
-+
-+#define CONFIG_STACKSIZE		(32*1024)	/* regular stack */
-+#define CONFIG_STACKSIZE_IRQ  		(4*1024)        /* IRQ stack */
-+#define CONFIG_STACKSIZE_FIQ  		(4*1024) 
-+
-+#ifdef CONFIG_USE_IRQ
-+#error CONFIG_USE_IRQ not supported
-+#endif
-+#endif
-diff -urN u-boot-2009.01-0rig/Makefile u-boot-2009.01/Makefile
---- u-boot-2009.01-0rig/Makefile	2009-01-02 10:03:11.000000000 +0100
-+++ u-boot-2009.01/Makefile	2009-01-01 21:31:34.000000000 +0100
-@@ -2568,6 +2568,12 @@
- at91rm9200dk_config	:	unconfig
- 	@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
- 
-+at91rm9200df_config	:	unconfig
-+	@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
-+
-+at91rm9200ek_config	:	unconfig
-+	@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
-+
- cmc_pu2_config	:	unconfig
- 	@$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
- 
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch
deleted file mode 100644
index b87a655e6..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch
+++ /dev/null
@@ -1,801 +0,0 @@
-diff -urN u-boot-2008.10-0rig/Makefile u-boot-2008.10/Makefile
---- u-boot-2008.10-0rig/Makefile	2008-12-28 14:07:30.000000000 +0100
-+++ u-boot-2008.10/Makefile	2008-12-28 14:06:28.000000000 +0100
-@@ -2541,6 +2541,22 @@
- 	fi;
- 	@$(MKCONFIG) -n at91sam9xeek -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91
- 
-+at91sam9g20ek_nandflash_config \
-+at91sam9g20ek_dataflash_cs0_config \
-+at91sam9g20ek_dataflash_cs1_config \
-+at91sam9g20ek_config	:	unconfig
-+	@if [ "$(findstring _nandflash,$@)" ] ; then \
-+		echo "#define CONFIG_USE_NANDFLASH 1"	>>$(obj)include/config.h ; \
-+		$(XECHO) "... with environment variable in NAND FLASH" ; \
-+	elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
-+		echo "#define CONFIG_USE_DATAFLASH_CS0 1"	>>$(obj)include/config.h ; \
-+		$(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
-+	else \
-+		echo "#define CONFIG_USE_DATAFLASH_CS1 1"	>>$(obj)include/config.h ; \
-+		$(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \
-+	fi;
-+	@$(MKCONFIG) -a at91sam9g20ek arm arm926ejs at91sam9g20ek atmel at91
-+
- at91sam9261ek_nandflash_config \
- at91sam9261ek_dataflash_cs0_config \
- at91sam9261ek_dataflash_cs3_config \
-Index: include/configs/at91sam9g20ek.h
-===================================================================
---- a/include/configs/at91sam9g20ek.h	(.../u-boot-1.3.4)	(revision 0)
-+++ b/include/configs/at91sam9g20ek.h	(.../u-boot-1.3.4-exp)	(revision 8417)
-@@ -0,0 +1,198 @@
-+/*
-+ * (C) Copyright 2007-2008
-+ * Stelian Pop <stelian.pop@leadtechdesign.com>
-+ * Lead Tech Design <www.leadtechdesign.com>
-+ *
-+ * Configuation settings for the AT91SAM9G20EK board.
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#ifndef __CONFIG_H
-+#define __CONFIG_H
-+
-+/* ARM asynchronous clock */
-+#define AT91_MAIN_CLOCK		396288000	/* from 18.432 MHz crystal */
-+#define AT91_MASTER_CLOCK	132096000	/* peripheral = main / 3 */
-+#define CONFIG_SYS_HZ			1000000		/* 1us resolution */
-+
-+#define AT91_SLOW_CLOCK		32768	/* slow clock */
-+
-+#define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
-+#define CONFIG_AT91SAM9G20	1	/* It's an Atmel AT91SAM9G20 SoC*/
-+#define CONFIG_AT91SAM9G20EK	1	/* on an AT91SAM9G20EK Board	*/
-+#undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
-+
-+#define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
-+#define CONFIG_SETUP_MEMORY_TAGS 1
-+#define CONFIG_INITRD_TAG	1
-+
-+#define CONFIG_SKIP_LOWLEVEL_INIT
-+#define CONFIG_SKIP_RELOCATE_UBOOT
-+
-+/*
-+ * Hardware drivers
-+ */
-+#define CONFIG_ATMEL_USART	1
-+#undef CONFIG_USART0
-+#undef CONFIG_USART1
-+#undef CONFIG_USART2
-+#define CONFIG_USART3		1	/* USART 3 is DBGU */
-+
-+#define CONFIG_BOOTDELAY	3
-+
-+/*
-+ * BOOTP options
-+ */
-+#define CONFIG_BOOTP_BOOTFILESIZE	1
-+#define CONFIG_BOOTP_BOOTPATH		1
-+#define CONFIG_BOOTP_GATEWAY		1
-+#define CONFIG_BOOTP_HOSTNAME		1
-+
-+/*
-+ * Command line configuration.
-+ */
-+#include <config_cmd_default.h>
-+#undef CONFIG_CMD_BDI
-+#undef CONFIG_CMD_IMI
-+#undef CONFIG_CMD_AUTOSCRIPT
-+#undef CONFIG_CMD_FPGA
-+#undef CONFIG_CMD_LOADS
-+#undef CONFIG_CMD_IMLS
-+
-+#define CONFIG_CMD_PING		1
-+#define CONFIG_CMD_DHCP		1
-+#define CONFIG_CMD_NAND
-+#define CONFIG_CMD_USB		1
-+
-+/* SDRAM */
-+#define CONFIG_NR_DRAM_BANKS		1
-+#define PHYS_SDRAM			0x20000000
-+#define PHYS_SDRAM_SIZE			0x04000000	/* 64 megs */
-+
-+/* DataFlash */
-+#define CONFIG_HAS_DATAFLASH		1
-+#define CONFIG_SYS_SPI_WRITE_TOUT		(5*CONFIG_SYS_HZ)
-+#define CONFIG_SYS_MAX_DATAFLASH_BANKS		2
-+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
-+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1	0xD0000000	/* CS1 */
-+#define AT91_SPI_CLK			15000000
-+#define DATAFLASH_TCSS			(0x22 << 16)
-+#define DATAFLASH_TCHS			(0x1 << 24)
-+#define AT91SAM9260_BASE_SPI0		0xfffc8000
-+/* NAND flash */
-+#define NAND_MAX_CHIPS			1
-+#define CONFIG_SYS_MAX_NAND_DEVICE		1
-+#define CONFIG_SYS_NAND_BASE			0x40000000
-+#define CONFIG_SYS_NAND_DBW_8			1
-+
-+/* NOR flash - no real flash on this board */
-+#define CONFIG_SYS_NO_FLASH			1
-+
-+/* Ethernet */
-+#define CONFIG_MACB			1
-+#define CONFIG_RMII			1
-+#define CONFIG_NET_MULTI		1
-+#define CONFIG_NET_RETRY_COUNT		20
-+#define CONFIG_RESET_PHY_R		1
-+#define AT91SAM9260_BASE_EMAC		0xfffc4000
-+/* USB */
-+#define CONFIG_USB_OHCI_NEW		1
-+#define LITTLEENDIAN			1
-+#define CONFIG_DOS_PARTITION		1
-+#define CONFIG_SYS_USB_OHCI_CPU_INIT		1
-+#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9G20_UHP_BASE */
-+#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9g20"
-+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
-+#define CONFIG_USB_STORAGE		1
-+
-+#define CONFIG_SYS_LOAD_ADDR			0x22000000	/* load address */
-+
-+#define CONFIG_SYS_MEMTEST_START		PHYS_SDRAM
-+#define CONFIG_SYS_MEMTEST_END			0x23e00000
-+
-+#ifdef CONFIG_USE_DATAFLASH_CS0
-+
-+/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-+#define CONFIG_ENV_IS_IN_DATAFLASH	1
-+#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
-+#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
-+#define CONFIG_ENV_SIZE		0x4200
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
-+				"root=/dev/mtdblock0 "			\
-+				"mtdparts=at91_nand:-(root) "		\
-+				"rw rootfstype=jffs2"
-+
-+#elif CONFIG_USE_DATAFLASH_CS1
-+
-+/* bootstrap + u-boot + env + linux in dataflash on CS1 */
-+#define CONFIG_ENV_IS_IN_DATAFLASH	1
-+#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
-+#define CONFIG_ENV_OFFSET		0x4200
-+#define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
-+#define CONFIG_ENV_SIZE		0x4200
-+#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
-+#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
-+				"root=/dev/mtdblock0 "			\
-+				"mtdparts=at91_nand:-(root) "		\
-+				"rw rootfstype=jffs2"
-+
-+#else /* CONFIG_USE_NANDFLASH */
-+
-+/* bootstrap + u-boot + env + linux in nandflash */
-+#define CONFIG_ENV_IS_IN_NAND	1
-+#define CONFIG_ENV_OFFSET		0x60000
-+#define CONFIG_ENV_OFFSET_REDUND	0x80000
-+#define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
-+#define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0xA0000 0x200000; bootm"
-+#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
-+				"root=/dev/mtdblock5 "			\
-+				"mtdparts=at91_nand:128k(bootstrap)ro,"	\
-+				"256k(uboot)ro,128k(env1)ro,"		\
-+				"128k(env2)ro,2M(linux),-(root) "	\
-+				"rw rootfstype=jffs2"
-+
-+#endif
-+
-+#define CONFIG_BAUDRATE		115200
-+#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
-+
-+#define CONFIG_SYS_PROMPT		"U-Boot> "
-+#define CONFIG_SYS_CBSIZE		256
-+#define CONFIG_SYS_MAXARGS		16
-+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-+#define CONFIG_SYS_LONGHELP		1
-+#define CONFIG_CMDLINE_EDITING	1
-+
-+#define ROUND(A, B)		(((A) + (B)) & ~((B) - 1))
-+/*
-+ * Size of malloc() pool
-+ */
-+#define CONFIG_SYS_MALLOC_LEN		ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
-+#define CONFIG_SYS_GBL_DATA_SIZE	128	/* 128 bytes for initial data */
-+
-+#define CONFIG_STACKSIZE	(32*1024)	/* regular stack */
-+
-+#ifdef CONFIG_USE_IRQ
-+#error CONFIG_USE_IRQ not supported
-+#endif
-+
-+#endif
-Index: board/atmel/at91sam9g20ek/nand.c
-===================================================================
---- a/board/atmel/at91sam9g20ek/nand.c	(.../u-boot-1.3.4)	(revision 0)
-+++ b/board/atmel/at91sam9g20ek/nand.c	(.../u-boot-1.3.4-exp)	(revision 8417)
-@@ -0,0 +1,78 @@
-+/*
-+ * (C) Copyright 2007-2008
-+ * Stelian Pop <stelian.pop@leadtechdesign.com>
-+ * Lead Tech Design <www.leadtechdesign.com>
-+ *
-+ * (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <common.h>
-+#include <asm/arch/at91sam9260.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91_pio.h>
-+
-+#include <nand.h>
-+
-+/*
-+ *	hardware specific access to control-lines
-+ */
-+#define	MASK_ALE	(1 << 21)	/* our ALE is AD21 */
-+#define	MASK_CLE	(1 << 22)	/* our CLE is AD22 */
-+
-+static void at91sam9g20ek_nand_hwcontrol(struct mtd_info *mtd,
-+					 int cmd, unsigned int ctrl)
-+{
-+	struct nand_chip *this = mtd->priv;
-+
-+	if (ctrl & NAND_CTRL_CHANGE) {
-+		ulong IO_ADDR_W = (ulong) this->IO_ADDR_W;
-+		IO_ADDR_W &= ~(MASK_ALE | MASK_CLE);
-+
-+		if (ctrl & NAND_CLE)
-+			IO_ADDR_W |= MASK_CLE;
-+		if (ctrl & NAND_ALE)
-+			IO_ADDR_W |= MASK_ALE;
-+
-+		at91_set_gpio_value(AT91_PIN_PC14, !(ctrl & NAND_NCE));
-+		this->IO_ADDR_W = (void *) IO_ADDR_W;
-+	}
-+
-+	if (cmd != NAND_CMD_NONE)
-+		writeb(cmd, this->IO_ADDR_W);
-+}
-+
-+static int at91sam9g20ek_nand_ready(struct mtd_info *mtd)
-+{
-+	return at91_get_gpio_value(AT91_PIN_PC13);
-+}
-+
-+int board_nand_init(struct nand_chip *nand)
-+{
-+	nand->ecc.mode = NAND_ECC_SOFT;
-+#ifdef CONFIG_SYS_NAND_DBW_16
-+	nand->options = NAND_BUSWIDTH_16;
-+#endif
-+	nand->cmd_ctrl = at91sam9g20ek_nand_hwcontrol;
-+	nand->dev_ready = at91sam9g20ek_nand_ready;
-+	nand->chip_delay = 20;
-+
-+	return 0;
-+}
-Index: board/atmel/at91sam9g20ek/at91sam9g20ek.c
-===================================================================
---- a/board/atmel/at91sam9g20ek/at91sam9g20ek.c	(.../u-boot-1.3.4)	(revision 0)
-+++ b/board/atmel/at91sam9g20ek/at91sam9g20ek.c	(.../u-boot-1.3.4-exp)	(revision 8417)
-@@ -0,0 +1,250 @@
-+/*
-+ * (C) Copyright 2007-2008
-+ * Stelian Pop <stelian.pop@leadtechdesign.com>
-+ * Lead Tech Design <www.leadtechdesign.com>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <common.h>
-+#include <asm/arch/at91sam9260.h>
-+#include <asm/arch/at91sam9260_matrix.h>
-+#include <asm/arch/at91sam9_smc.h>
-+#include <asm/arch/at91_pmc.h>
-+#include <asm/arch/at91_rstc.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/io.h>
-+#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
-+#include <net.h>
-+#endif
-+#include <netdev.h>
-+DECLARE_GLOBAL_DATA_PTR;
-+
-+/* ------------------------------------------------------------------------- */
-+/*
-+ * Miscelaneous platform dependent initialisations
-+ */
-+
-+static void at91sam9g20ek_serial_hw_init(void)
-+{
-+#ifdef CONFIG_USART0
-+	at91_set_A_periph(AT91_PIN_PB4, 1);		/* TXD0 */
-+	at91_set_A_periph(AT91_PIN_PB5, 0);		/* RXD0 */
-+	at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0);
-+#endif
-+
-+#ifdef CONFIG_USART1
-+	at91_set_A_periph(AT91_PIN_PB6, 1);		/* TXD1 */
-+	at91_set_A_periph(AT91_PIN_PB7, 0);		/* RXD1 */
-+	at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1);
-+#endif
-+
-+#ifdef CONFIG_USART2
-+	at91_set_A_periph(AT91_PIN_PB8, 1);		/* TXD2 */
-+	at91_set_A_periph(AT91_PIN_PB9, 0);		/* RXD2 */
-+	at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2);
-+#endif
-+
-+#ifdef CONFIG_USART3	/* DBGU */
-+	at91_set_A_periph(AT91_PIN_PB14, 0);		/* DRXD */
-+	at91_set_A_periph(AT91_PIN_PB15, 1);		/* DTXD */
-+	at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS);
-+#endif
-+}
-+
-+#ifdef CONFIG_CMD_NAND
-+static void at91sam9g20ek_nand_hw_init(void)
-+{
-+	unsigned long csa;
-+
-+	/* Enable CS3 */
-+	csa = at91_sys_read(AT91_MATRIX_EBICSA);
-+	at91_sys_write(AT91_MATRIX_EBICSA,
-+		       csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);
-+
-+	/* Configure SMC CS3 for NAND/SmartMedia */
-+	at91_sys_write(AT91_SMC_SETUP(3),
-+		       AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) |
-+		       AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0));
-+	at91_sys_write(AT91_SMC_PULSE(3),
-+		       AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(3) |
-+		       AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(3));
-+	at91_sys_write(AT91_SMC_CYCLE(3),
-+		       AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7));
-+	at91_sys_write(AT91_SMC_MODE(3),
-+		       AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
-+		       AT91_SMC_EXNWMODE_DISABLE |
-+#ifdef CONFIG_SYS_NAND_DBW_16
-+		       AT91_SMC_DBW_16 |
-+#else /* CONFIG_SYS_NAND_DBW_8 */
-+		       AT91_SMC_DBW_8 |
-+#endif
-+		       AT91_SMC_TDF_(3));
-+
-+	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC);
-+
-+	/* Configure RDY/BSY */
-+	at91_set_gpio_input(AT91_PIN_PC13, 1);
-+
-+	/* Enable NandFlash */
-+	at91_set_gpio_output(AT91_PIN_PC14, 1);
-+}
-+#endif
-+
-+#ifdef CONFIG_HAS_DATAFLASH
-+static void at91sam9g20ek_spi_hw_init(void)
-+{
-+	at91_set_A_periph(AT91_PIN_PA3, 0);	/* SPI0_NPCS0 */
-+	at91_set_B_periph(AT91_PIN_PC11, 0);	/* SPI0_NPCS1 */
-+
-+	at91_set_A_periph(AT91_PIN_PA0, 0);	/* SPI0_MISO */
-+	at91_set_A_periph(AT91_PIN_PA1, 0);	/* SPI0_MOSI */
-+	at91_set_A_periph(AT91_PIN_PA2, 0);	/* SPI0_SPCK */
-+
-+	/* Enable clock */
-+	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI0);
-+}
-+#endif
-+
-+#ifdef CONFIG_MACB
-+static void at91sam9g20ek_macb_hw_init(void)
-+{
-+	/* Enable clock */
-+	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_EMAC);
-+
-+	/*
-+	 * Disable pull-up on:
-+	 *	RXDV (PA17) => PHY normal mode (not Test mode)
-+	 *	ERX0 (PA14) => PHY ADDR0
-+	 *	ERX1 (PA15) => PHY ADDR1
-+	 *	ERX2 (PA25) => PHY ADDR2
-+	 *	ERX3 (PA26) => PHY ADDR3
-+	 *	ECRS (PA28) => PHY ADDR4  => PHYADDR = 0x0
-+	 *
-+	 * PHY has internal pull-down
-+	 */
-+	writel(pin_to_mask(AT91_PIN_PA14) |
-+	       pin_to_mask(AT91_PIN_PA15) |
-+	       pin_to_mask(AT91_PIN_PA17) |
-+	       pin_to_mask(AT91_PIN_PA25) |
-+	       pin_to_mask(AT91_PIN_PA26) |
-+	       pin_to_mask(AT91_PIN_PA28),
-+	       pin_to_controller(AT91_PIN_PA0) + PIO_PUDR);
-+
-+	/* Need to reset PHY -> 500ms reset */
-+	at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
-+				     (AT91_RSTC_ERSTL & (0x0D << 8)) |
-+				     AT91_RSTC_URSTEN);
-+
-+	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST);
-+
-+	/* Wait for end hardware reset */
-+	while (!(at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_NRSTL));
-+
-+	/* Restore NRST value */
-+	at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
-+				     (AT91_RSTC_ERSTL & (0x0 << 8)) |
-+				     AT91_RSTC_URSTEN);
-+
-+	/* Re-enable pull-up */
-+	writel(pin_to_mask(AT91_PIN_PA14) |
-+	       pin_to_mask(AT91_PIN_PA15) |
-+	       pin_to_mask(AT91_PIN_PA17) |
-+	       pin_to_mask(AT91_PIN_PA25) |
-+	       pin_to_mask(AT91_PIN_PA26) |
-+	       pin_to_mask(AT91_PIN_PA28),
-+	       pin_to_controller(AT91_PIN_PA0) + PIO_PUER);
-+
-+	at91_set_A_periph(AT91_PIN_PA19, 0);	/* ETXCK_EREFCK */
-+	at91_set_A_periph(AT91_PIN_PA17, 0);	/* ERXDV */
-+	at91_set_A_periph(AT91_PIN_PA14, 0);	/* ERX0 */
-+	at91_set_A_periph(AT91_PIN_PA15, 0);	/* ERX1 */
-+	at91_set_A_periph(AT91_PIN_PA18, 0);	/* ERXER */
-+	at91_set_A_periph(AT91_PIN_PA16, 0);	/* ETXEN */
-+	at91_set_A_periph(AT91_PIN_PA12, 0);	/* ETX0 */
-+	at91_set_A_periph(AT91_PIN_PA13, 0);	/* ETX1 */
-+	at91_set_A_periph(AT91_PIN_PA21, 0);	/* EMDIO */
-+	at91_set_A_periph(AT91_PIN_PA20, 0);	/* EMDC */
-+
-+#ifndef CONFIG_RMII
-+	at91_set_B_periph(AT91_PIN_PA28, 0);	/* ECRS */
-+	at91_set_B_periph(AT91_PIN_PA29, 0);	/* ECOL */
-+	at91_set_B_periph(AT91_PIN_PA25, 0);	/* ERX2 */
-+	at91_set_B_periph(AT91_PIN_PA26, 0);	/* ERX3 */
-+	at91_set_B_periph(AT91_PIN_PA27, 0);	/* ERXCK */
-+#if defined(CONFIG_AT91SAM9G20EK)
-+	/*
-+	 * use PA10, PA11 for ETX2, ETX3.
-+	 * PA23 and PA24 are for TWI EEPROM
-+	 */
-+	at91_set_B_periph(AT91_PIN_PA10, 0);    /* ETX2 */
-+	at91_set_B_periph(AT91_PIN_PA11, 0);    /* ETX3 */
-+#else
-+	at91_set_B_periph(AT91_PIN_PA23, 0);    /* ETX2 */
-+	at91_set_B_periph(AT91_PIN_PA24, 0);    /* ETX3 */
-+#endif
-+	at91_set_B_periph(AT91_PIN_PA22, 0);	/* ETXER */
-+#endif
-+
-+}
-+#endif
-+
-+int board_init(void)
-+{
-+	/* Enable Ctrlc */
-+	console_init_f();
-+
-+	/* arch number of AT91SAM9G20EK-Board */
-+	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK;
-+	/* adress of boot parameters */
-+	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-+
-+	at91sam9g20ek_serial_hw_init();
-+#ifdef CONFIG_CMD_NAND
-+	at91sam9g20ek_nand_hw_init();
-+#endif
-+#ifdef CONFIG_HAS_DATAFLASH
-+	at91sam9g20ek_spi_hw_init();
-+#endif
-+#ifdef CONFIG_MACB
-+	at91sam9g20ek_macb_hw_init();
-+#endif
-+
-+	return 0;
-+}
-+
-+int dram_init(void)
-+{
-+	gd->bd->bi_dram[0].start = PHYS_SDRAM;
-+	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
-+	return 0;
-+}
-+
-+#ifdef CONFIG_RESET_PHY_R
-+void reset_phy(void)
-+{
-+#ifdef CONFIG_MACB
-+	/*
-+	 * Initialize ethernet HW addr prior to starting Linux,
-+	 * needed for nfsroot
-+	 */
-+	eth_init(gd->bd);
-+#endif
-+}
-+#endif
-Index: board/atmel/at91sam9g20ek/led.c
-===================================================================
---- a/board/atmel/at91sam9g20ek/led.c	(.../u-boot-1.3.4)	(revision 0)
-+++ b/board/atmel/at91sam9g20ek/led.c	(.../u-boot-1.3.4-exp)	(revision 8417)
-@@ -0,0 +1,64 @@
-+/*
-+ * (C) Copyright 2007-2008
-+ * Stelian Pop <stelian.pop@leadtechdesign.com>
-+ * Lead Tech Design <www.leadtechdesign.com>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <common.h>
-+#include <asm/arch/at91sam9260.h>
-+#include <asm/arch/at91_pmc.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/io.h>
-+
-+#define	RED_LED		AT91_PIN_PA9	/* this is the power led */
-+#define	GREEN_LED	AT91_PIN_PA6	/* this is the user led */
-+
-+void red_LED_on(void)
-+{
-+	at91_set_gpio_value(RED_LED, 1);
-+}
-+
-+void red_LED_off(void)
-+{
-+	at91_set_gpio_value(RED_LED, 0);
-+}
-+
-+void green_LED_on(void)
-+{
-+	at91_set_gpio_value(GREEN_LED, 0);
-+}
-+
-+void green_LED_off(void)
-+{
-+	at91_set_gpio_value(GREEN_LED, 1);
-+}
-+
-+void coloured_LED_init(void)
-+{
-+	/* Enable clock */
-+	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOA);
-+
-+	at91_set_gpio_output(RED_LED, 1);
-+	at91_set_gpio_output(GREEN_LED, 1);
-+
-+	at91_set_gpio_value(RED_LED, 0);
-+	at91_set_gpio_value(GREEN_LED, 1);
-+}
-Index: board/atmel/at91sam9g20ek/partition.c
-===================================================================
---- a/board/atmel/at91sam9g20ek/partition.c	(.../u-boot-1.3.4)	(revision 0)
-+++ b/board/atmel/at91sam9g20ek/partition.c	(.../u-boot-1.3.4-exp)	(revision 8417)
-@@ -0,0 +1,40 @@
-+/*
-+ * (C) Copyright 2008
-+ * Ulf Samuelsson <ulf@atmel.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ */
-+#include <common.h>
-+#include <config.h>
-+#include <asm/hardware.h>
-+#include <dataflash.h>
-+
-+AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS];
-+
-+struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
-+	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
-+	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1, 1}
-+};
-+
-+/*define the area offsets*/
-+dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
-+	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
-+	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
-+	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-+	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
-+	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
-+};
-Index: board/atmel/at91sam9g20ek/config.mk
-===================================================================
---- a/board/atmel/at91sam9g20ek/config.mk	(.../u-boot-1.3.4)	(revision 0)
-+++ b/board/atmel/at91sam9g20ek/config.mk	(.../u-boot-1.3.4-exp)	(revision 8417)
-@@ -0,0 +1 @@
-+TEXT_BASE = 0x23f00000
-Index: board/atmel/at91sam9g20ek/Makefile
-===================================================================
---- a/board/atmel/at91sam9g20ek/Makefile	(.../u-boot-1.3.4)	(revision 0)
-+++ b/board/atmel/at91sam9g20ek/Makefile	(.../u-boot-1.3.4-exp)	(revision 8417)
-@@ -0,0 +1,57 @@
-+#
-+# (C) Copyright 2003-2008
-+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-+#
-+# (C) Copyright 2008
-+# Stelian Pop <stelian.pop@leadtechdesign.com>
-+# Lead Tech Design <www.leadtechdesign.com>
-+#
-+# See file CREDITS for list of people who contributed to this
-+# project.
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+# MA 02111-1307 USA
-+#
-+
-+include $(TOPDIR)/config.mk
-+
-+LIB	= $(obj)lib$(BOARD).a
-+
-+COBJS-y	+= at91sam9g20ek.o
-+COBJS-y	+= led.o
-+COBJS-y	+= partition.o
-+COBJS-$(CONFIG_CMD_NAND) += nand.o
-+
-+SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
-+OBJS	:= $(addprefix $(obj),$(COBJS-y))
-+SOBJS	:= $(addprefix $(obj),$(SOBJS))
-+
-+$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
-+	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
-+
-+clean:
-+	rm -f $(SOBJS) $(OBJS)
-+
-+distclean:	clean
-+	rm -f $(LIB) core *.bak $(obj).depend
-+
-+#########################################################################
-+
-+# defines $(obj).depend target
-+include $(SRCTREE)/rules.mk
-+
-+sinclude $(obj).depend
-+
-+#########################################################################
-Index: include/asm-arm/arch-at91/hardware.h
-===================================================================
---- a/include/asm-arm/arch-at91/hardware.h	(.../u-boot-1.3.4)	(revision 8417)
-+++ b/include/asm-arm/arch-at91/hardware.h	(.../u-boot-1.3.4-exp)	(revision 8417)
-@@ -18,7 +18,7 @@
- 
- #if defined(CONFIG_AT91RM9200)
- #include <asm/arch/at91rm9200.h>
--#elif defined(CONFIG_AT91SAM9260)
-+#elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
- #include <asm/arch/at91sam9260.h>
- #define AT91_BASE_EMAC	AT91SAM9260_BASE_EMAC
- #define AT91_BASE_SPI	AT91SAM9260_BASE_SPI0
-diff -urN u-boot-2008.10-0rig/include/asm-arm/mach-types.h u-boot-2008.10/include/asm-arm/mach-types.h
---- u-boot-2008.10-0rig/include/asm-arm/mach-types.h	2008-10-18 21:30:31.000000000 +0200
-+++ u-boot-2008.10/include/asm-arm/mach-types.h	2008-12-28 23:40:55.000000000 +0100
-@@ -23998,6 +23998,18 @@
- # define machine_is_geneva()	(0)
- #endif
- 
-+#ifdef CONFIG_MACH_AT91SAM9G20EK
-+# ifdef machine_arch_type
-+#  undef machine_arch_type
-+#  define machine_arch_type __machine_arch_type
-+# else
-+#  define machine_arch_type MACH_TYPE_AT91SAM9G20EK
-+# endif
-+# define machine_is_at91sam9g20ek() (machine_arch_type == MACH_TYPE_AT91SAM9G20EK)
-+#else
-+# define machine_is_at91sam9g20ek() (0)
-+#endif
-+
- /*
-  * These have not yet been registered
-  */
-diff -urN u-boot-2008.10-0rig/board/atmel/at91sam9g20ek/at91sam9g20ek.c u-boot-2008.10/board/atmel/at91sam9g20ek/at91sam9g20ek.c
---- u-boot-2008.10-0rig/board/atmel/at91sam9g20ek/at91sam9g20ek.c	2008-12-28 14:09:52.000000000 +0100
-+++ u-boot-2008.10/board/atmel/at91sam9g20ek/at91sam9g20ek.c	2008-12-28 23:56:09.000000000 +0100
-@@ -248,3 +248,13 @@
- #endif
- }
- #endif
-+
-+int board_eth_init(bd_t *bis)
-+{
-+	int rc = 0;
-+#ifdef CONFIG_MACB
-+	rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x00);
-+#endif
-+	return rc;
-+}
-+
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch
deleted file mode 100644
index 81ab7c6e6..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN u-boot-2008.10-0rig/drivers/net/macb.c u-boot-2008.10/drivers/net/macb.c
---- u-boot-2008.10-0rig/drivers/net/macb.c	2008-10-18 21:30:31.000000000 +0200
-+++ u-boot-2008.10/drivers/net/macb.c	2008-12-28 23:44:11.000000000 +0100
-@@ -415,18 +415,16 @@
- 
- 	/* choose RMII or MII mode. This depends on the board */
- #ifdef CONFIG_RMII
--#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
--    defined(CONFIG_AT91SAM9263)
--	macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
--#else
-+#if defined(CONFIG_AVR32)
- 	macb_writel(macb, USRIO, 0);
--#endif
- #else
--#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
--    defined(CONFIG_AT91SAM9263)
--	macb_writel(macb, USRIO, MACB_BIT(CLKEN));
-+	macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
-+#endif
- #else
-+#if defined(CONFIG_AVR32)
- 	macb_writel(macb, USRIO, MACB_BIT(MII));
-+#else
-+	macb_writel(macb, USRIO, MACB_BIT(CLKEN));
- #endif
- #endif /* CONFIG_RMII */
- 
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-007-tools.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-007-tools.patch
deleted file mode 100644
index 8f71ee043..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-007-tools.patch
+++ /dev/null
@@ -1,576 +0,0 @@
-diff -urN u-boot-2008.10-0rig//tools/Makefile u-boot-2008.10/tools/Makefile
---- u-boot-2008.10-0rig//tools/Makefile	2008-12-31 17:51:29.000000000 +0100
-+++ u-boot-2008.10/tools/Makefile	2008-12-31 19:38:15.000000000 +0100
-@@ -37,6 +37,11 @@
- #OBJ_FILES	+= mpc86x_clk.o
- #endif
- 
-+ifeq ($(VENDOR),atmel)
-+BINS+= raw-at91$(SFX) sx-at91$(SFX)
-+OBJS+= raw-at91.o sx-at91.o
-+endif
-+
- LIBFDT_OBJ_FILES	= $(obj)fdt.o $(obj)fdt_ro.o $(obj)fdt_rw.o $(obj)fdt_strerror.o $(obj)fdt_wip.o
- 
- LOGO_H	= $(OBJTREE)/include/bmp_logo.h
-@@ -175,6 +180,14 @@
- 		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
- 		$(STRIP) $@
- 
-+$(obj)raw-at91$(SFX):	$(obj)raw-at91.o
-+		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
-+		$(STRIP) $@
-+
-+$(obj)sx-at91$(SFX):	$(obj)sx-at91.o
-+		$(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^
-+		$(STRIP) $@
-+
- $(obj)envcrc.o:	$(src)envcrc.c
- 		$(CC) -g $(CFLAGS) -c -o $@ $<
- 
-@@ -223,6 +236,12 @@
- $(obj)fdt_wip.o:	$(obj)fdt_wip.c
- 		$(CC) -g $(FIT_CFLAGS) -c -o $@ $<
- 
-+$(obj)sx-at91.o:		$(src)sx-at91.c
-+		$(CC) -g $(CFLAGS) -c -o $@ $<
-+
-+$(obj)raw-at91.o:	$(src)raw-at91.c
-+		$(CC) -g $(CFLAGS) -c -o $@ $<
-+
- subdirs:
- ifeq ($(TOOLSUBDIRS),)
- 		@:
-diff -urN u-boot-2008.10-0rig//tools/raw-at91.c u-boot-2008.10/tools/raw-at91.c
---- u-boot-2008.10-0rig//tools/raw-at91.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2008.10/tools/raw-at91.c	2008-12-31 19:26:23.000000000 +0100
-@@ -0,0 +1,225 @@
-+/*
-+ * xmodem-at91.c
-+ *
-+ * A simple program using xmodem/1kxmode upload file to at91rm9200 based board.
-+ * Created by (C) Copyright 2004
-+ * Linhang.Zhang, Jilin University of PR.China, linxing@jlu.edu.cn.
-+ *
-+ *************************************************************************************
-+ *
-+ * Modified 01-Feb-2005 (C)Copyright 2005
-+ * Marco Cavallini, www.KoanSoftware.com - ITALY, m.cavallini@koansoftware.com
-+ * - edited indentations and changed break usage in switch statement.
-+ * - added "\r" to printf
-+ *
-+ * - build with 
-+ *   gcc sx-at91.c -o sx-at91
-+ *
-+ * - Howto use this program with minicom/xminicom and AT91 
-+ *   start minicom or xminicom
-+ *   edit Options / File transfer protocol, 
-+ *   add a name (for example J) like the following example
-+ *
-+ *   |     Name             Program                 Name U/D FullScr IO-Red. Multi  |
-+ *   | A  zmodem     /usr/bin/sz -vv -b              Y    U    N       Y       Y    |
-+ *   | B  ymodem     /usr/bin/sb -vv                 Y    U    N       Y       Y    |
-+ *   | C  xmodem     /usr/bin/sx -vv                 Y    U    N       Y       N    |
-+ *   | D  zmodem     /usr/bin/rz -vv -b -E           N    D    N       Y       Y    |
-+ *   | E  ymodem     /usr/bin/rb -vv                 N    D    N       Y       Y    |
-+ *   | F  xmodem     /usr/bin/rx -vv                 Y    D    N       Y       N    |
-+ *   | G  kermit     /usr/bin/kermit -i -l %l -s     Y    U    Y       N       N    |
-+ *   | H  kermit     /usr/bin/kermit -i -l %l -r     N    D    Y       N       N    |
-+ *   | I  ascii      /usr/bin/ascii-xfr -dsv         Y    U    N       Y       N    |
-+ *   | J  at91       /home/koan/xmodem/xs-at91       Y    U    Y       N       N    |
-+ *   | K    -                                                                       |
-+ *   | L    -                                                                       |
-+ *
-+ *   save and use it selecting at91 protocol when you start an Xmodem upload to AT91
-+ *
-+ *************************************************************************************
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include     <stdio.h>
-+#include     <stdlib.h>
-+#include     <string.h>
-+#include     <unistd.h>
-+#include     <sys/types.h>
-+#include     <sys/stat.h>
-+#include     <fcntl.h>
-+#include     <termios.h>
-+#include     <errno.h>
-+#include     <time.h>
-+
-+#define	TRUE		1
-+#define	FALSE		0
-+#define LINESIZE	1024
-+
-+/*********/
-+
-+#define SERIAL_DEVICE "/dev/ttyS0"
-+#define MYBAUDRATE B115200
-+
-+/***************SUB PROGRAM*******/
-+
-+int Initial_SerialPort(void)
-+{
-+	int fd;
-+	struct termios options;
-+
-+	fd = open( SERIAL_DEVICE , O_RDWR | O_NOCTTY | O_NDELAY );
-+	if ( fd == -1 )
-+	{ 
-+		/*open error!*/
-+		perror("Can't open serial port!");
-+		return -1;
-+	}
-+
-+	/*Get the current options for the port...*/
-+	tcgetattr(fd, &options);
-+
-+	/*Set the baud rates to BAUDRATE...*/
-+	cfsetispeed(&options,MYBAUDRATE);
-+	cfsetospeed(&options,MYBAUDRATE);
-+	tcsetattr(fd, TCSANOW, &options);
-+	if (0 != tcgetattr(fd, &options)) 
-+	{
-+		perror("SetupSerial 1");
-+		return -1;
-+	} 
-+	
-+	/*
-+	 * 8bit Data,no partity,1 stop bit...
-+	 */
-+	options.c_cflag &= ~PARENB;
-+	options.c_cflag &= ~CSTOPB;
-+	options.c_cflag &= ~CSIZE;
-+	options.c_cflag |= CS8;
-+	tcflush(fd,TCIFLUSH);
-+
-+	/***Choosing Raw Input*/
-+	options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
-+	options.c_oflag &= ~OPOST; 
-+
-+	/*
-+	 * Set the new options for the port...
-+	 */
-+	if (0 != tcsetattr(fd, TCSANOW, &options))
-+	{
-+ 		perror("SetupSerial error");
-+ 		return -1 ;
-+	}
-+
-+	return fd ;
-+}
-+
-+/******************************/
-+void ClearReceiveBuffer(int fd)
-+{
-+	unsigned char tmp;
-+	while ((read(fd,&tmp,1))>0);
-+	
-+	return;
-+}
-+unsigned char filebuf[ LINESIZE+2 ];
-+unsigned char outbuf[ LINESIZE+2 ];
-+FILE *datafile;
-+int fd;
-+
-+static	unsigned int	ChCnt=0;
-+static	unsigned int	ChIx;
-+unsigned char	GetChar(unsigned char *ch)
-+/* 
-+ * SUCCESS:	Return TRUE
-+ * FAILURE:	Return FALSE
-+ */
-+{
-+  
-+  if(ChCnt == 0) {
-+    ChCnt = fread( filebuf, sizeof(char), LINESIZE, datafile);
-+    ChIx = 0;
-+  }
-+  if(ChCnt > 0) {
-+    *ch = filebuf[ChIx++];
-+    ChCnt--;
-+    return TRUE;
-+  } else {
-+    return FALSE;	/* Reached End of File */
-+  }
-+}
-+
-+/********************************/
-+void	delay()
-+{
-+}
-+
-+int main(int argc,char *argv[])
-+{
-+	char *data_file_name;
-+	int	len;
-+	unsigned char c;
-+	int complete,i,sts;
-+
-+	printf("raw-at91 started...\r\n");
-+	
-+	/* open serial port1 */
-+	if ( (fd = Initial_SerialPort()) == -1)  
-+		return -1 ;
-+
-+	data_file_name = argv[1];
-+
-+	if((datafile=fopen(data_file_name,"rb"))==NULL)
-+	{
-+		perror ("Can't open file!");
-+		return -1 ;
-+	}
-+
-+	/*******************************/
-+	
-+	complete = 0;
-+	/*	ClearReceiveBuffer(fd); */
-+
-+	/* while((read(fd,&ack_id,1))<=0);*/
-+	
-+	/* printf("%c\r\n",ack_id); */
-+	while(!complete)
-+	{
-+	  for(i=0;i < LINESIZE; i++) {		/* A line more than 1024 characters will have problems...*/
-+	    if((sts = GetChar(&outbuf[i]))) {
-+	      /* Sts = Success */
-+	      if((c = outbuf[i]) == '\n') {	/* Found end of Line - Start Processing*/
-+		outbuf[i+1] = '\0';		/* Terminate String*/
-+		break;
-+	      }
-+	    } else {
-+	      /* Sts = Failure - End of File */
-+	      outbuf[i] = '\n';
-+	      outbuf[i+1] = '\0';
-+	      complete = 1;
-+	    }
-+	  }
-+	  printf("%s",outbuf);		/* Inform user */
-+	  len = strlen((char *)outbuf);
-+	  write(fd,outbuf,strlen((char *)outbuf));
-+	  for(i = 0; i < 500000000; i++ ) delay();
-+	  while((read(fd,&c,1))<=0) putchar(c);
-+	  printf("  ");
-+	}
-+	fclose(datafile);
-+	close(fd);
-+	return 0;
-+}
-diff -urN u-boot-2008.10-0rig//tools/sx-at91.c u-boot-2008.10/tools/sx-at91.c
---- u-boot-2008.10-0rig//tools/sx-at91.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2008.10/tools/sx-at91.c	2008-12-31 19:26:23.000000000 +0100
-@@ -0,0 +1,300 @@
-+/*
-+ * xmodem-at91.c
-+ *
-+ * A simple program using xmodem/1kxmode upload file to at91rm9200 based board.
-+ * Created by (C) Copyright 2004
-+ * Linhang.Zhang, Jilin University of PR.China, linxing@jlu.edu.cn.
-+ *
-+ *************************************************************************************
-+ *
-+ * Modified 01-Feb-2005 (C)Copyright 2005
-+ * Marco Cavallini, www.KoanSoftware.com - ITALY, m.cavallini@koansoftware.com
-+ * - edited indentations and changed break usage in switch statement.
-+ * - added "\r" to printf
-+ *
-+ * - build with 
-+ *   gcc sx-at91.c -o sx-at91
-+ *
-+ * - Howto use this program with minicom/xminicom and AT91 
-+ *   start minicom or xminicom
-+ *   edit Options / File transfer protocol, 
-+ *   add a name (for example J) like the following example
-+ *
-+ *   |     Name             Program                 Name U/D FullScr IO-Red. Multi  |
-+ *   | A  zmodem     /usr/bin/sz -vv -b              Y    U    N       Y       Y    |
-+ *   | B  ymodem     /usr/bin/sb -vv                 Y    U    N       Y       Y    |
-+ *   | C  xmodem     /usr/bin/sx -vv                 Y    U    N       Y       N    |
-+ *   | D  zmodem     /usr/bin/rz -vv -b -E           N    D    N       Y       Y    |
-+ *   | E  ymodem     /usr/bin/rb -vv                 N    D    N       Y       Y    |
-+ *   | F  xmodem     /usr/bin/rx -vv                 Y    D    N       Y       N    |
-+ *   | G  kermit     /usr/bin/kermit -i -l %l -s     Y    U    Y       N       N    |
-+ *   | H  kermit     /usr/bin/kermit -i -l %l -r     N    D    Y       N       N    |
-+ *   | I  ascii      /usr/bin/ascii-xfr -dsv         Y    U    N       Y       N    |
-+ *   | J  at91       /home/koan/xmodem/xs-at91       Y    U    Y       N       N    |
-+ *   | K    -                                                                       |
-+ *   | L    -                                                                       |
-+ *
-+ *   save and use it selecting at91 protocol when you start an Xmodem upload to AT91
-+ *
-+ *************************************************************************************
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include     <stdio.h>
-+#include     <stdlib.h>
-+#include     <unistd.h>
-+#include     <sys/types.h>
-+#include     <sys/stat.h>
-+#include     <fcntl.h>
-+#include     <termios.h>
-+#include     <errno.h>
-+#include     <time.h>
-+
-+/*
-+Xmodem Frame form: <SOH><blk #><255-blk #><--128 data bytes--><CRC hi><CRC lo>
-+*/
-+
-+#define XMODEM_SOH 0x01
-+#define XMODEM_STX 0x02
-+#define XMODEM_EOT 0x04
-+#define XMODEM_ACK 0x06
-+#define XMODEM_NAK 0x15
-+#define XMODEM_CRC_CHR	'C'
-+#define XMODEM_CRC_SIZE 2			/* Crc_High Byte + Crc_Low Byte */
-+#define XMODEM_FRAME_ID_SIZE 2 /* Frame_Id + 255-Frame_Id */
-+#define XMODEM_DATA_SIZE_SOH 128  /* for Xmodem protocol */
-+#define XMODEM_DATA_SIZE_STX 1024 /* for 1K xmodem protocol */
-+#define USE_1K_XMODEM 0  /* 1 for use 1k_xmodem 0 for xmodem */
-+
-+#if (USE_1K_XMODEM)
-+	#define XMODEM_DATA_SIZE 	XMODEM_DATA_SIZE_STX
-+	#define XMODEM_HEAD		XMODEM_STX
-+#else
-+	#define XMODEM_DATA_SIZE 	XMODEM_DATA_SIZE_SOH
-+	#define XMODEM_HEAD 		XMODEM_SOH
-+#endif
-+/*********/
-+
-+#define SERIAL_DEVICE "/dev/ttyS0"
-+#define MYBAUDRATE B115200
-+
-+/***************SUB PROGRAM*******/
-+unsigned short GetCrc16 ( char *ptr, unsigned short count )
-+{
-+	unsigned short crc, i;
-+
-+	crc = 0;
-+	while(count--)
-+	{
-+		crc = crc ^ (int) *ptr++ << 8;
-+	
-+		for(i = 0; i < 8; i++)
-+		{
-+			if(crc & 0x8000)
-+				crc = crc << 1 ^ 0x1021;
-+			else			
-+				crc = crc << 1;
-+		}
-+	}
-+
-+	return (crc & 0xFFFF);
-+}
-+
-+/*******************************/
-+int Initial_SerialPort(void)
-+{
-+	int fd;
-+	struct termios options;
-+
-+	fd = open( SERIAL_DEVICE , O_RDWR | O_NOCTTY | O_NDELAY );
-+	if ( fd == -1 )
-+	{ 
-+		/*open error!*/
-+		perror("Can't open serial port!");
-+		return -1;
-+	}
-+
-+	/*Get the current options for the port...*/
-+	tcgetattr(fd, &options);
-+
-+	/*Set the baud rates to BAUDRATE...*/
-+	cfsetispeed(&options,MYBAUDRATE);
-+	cfsetospeed(&options,MYBAUDRATE);
-+	tcsetattr(fd, TCSANOW, &options);
-+	if (0 != tcgetattr(fd, &options)) 
-+	{
-+		perror("SetupSerial 1");
-+		return -1;
-+	} 
-+	
-+	/*
-+	 * 8bit Data,no partity,1 stop bit...
-+	 */
-+	options.c_cflag &= ~PARENB;
-+	options.c_cflag &= ~CSTOPB;
-+	options.c_cflag &= ~CSIZE;
-+	options.c_cflag |= CS8;
-+	tcflush(fd,TCIFLUSH);
-+
-+	/***Choosing Raw Input*/
-+	options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
-+	options.c_oflag &= ~OPOST; 
-+
-+	/*
-+	 * Set the new options for the port...
-+	 */
-+	if (0 != tcsetattr(fd, TCSANOW, &options))
-+	{
-+ 		perror("SetupSerial error");
-+ 		return -1 ;
-+	}
-+
-+	return fd ;
-+}
-+
-+/******************************/
-+void ClearReceiveBuffer(int fd)
-+{
-+	unsigned char tmp;
-+	while ((read(fd,&tmp,1))>0);
-+	
-+	return;
-+}
-+
-+/********************************/
-+int main(int argc,char *argv[])
-+{
-+	int fd;
-+	char *data_file_name;
-+	char packet_data[ XMODEM_DATA_SIZE ];
-+	char frame_data[ XMODEM_DATA_SIZE + XMODEM_CRC_SIZE + XMODEM_FRAME_ID_SIZE + 1 ];
-+	FILE *datafile;
-+	int complete,retry_num,pack_counter,read_number,write_number,i;
-+	unsigned short crc_value;
-+	unsigned char ack_id;
-+
-+	printf("sx-at91 started...\r\n");
-+	
-+	/* open serial port1 */
-+	if ( (fd = Initial_SerialPort()) == -1)  
-+		return -1 ;
-+
-+	data_file_name = argv[1];
-+
-+	if((datafile=fopen(data_file_name,"rb"))==NULL)
-+	{
-+		perror ("Can't open file!");
-+		return -1 ;
-+	}
-+
-+	/*******************************/
-+	
-+	pack_counter = 0;
-+	complete = 0;
-+	retry_num = 0;
-+	ClearReceiveBuffer(fd);
-+
-+	while((read(fd,&ack_id,1))<=0);
-+	
-+	printf("%c\r\n",ack_id);
-+	ack_id=XMODEM_ACK;
-+	while(!complete)
-+	{
-+		switch(ack_id)
-+		{
-+		case XMODEM_ACK:
-+			retry_num = 0;
-+			pack_counter++;
-+			read_number = fread( packet_data, sizeof(char), XMODEM_DATA_SIZE, datafile);
-+			if(read_number>0)
-+			{
-+				if(read_number<XMODEM_DATA_SIZE_SOH)
-+				{
-+			
-+					printf("Start filling the last frame!\r\n");
-+					for(;read_number<XMODEM_DATA_SIZE;read_number++)
-+						packet_data[read_number] = 0x00;
-+				}
-+				frame_data[0] = XMODEM_HEAD;
-+				frame_data[1] = (char)pack_counter;
-+				frame_data[2] = (char)(255-frame_data[1]);
-+	
-+				for(i=0;i<XMODEM_DATA_SIZE;i++)
-+					frame_data[i+3]=packet_data[i];
-+	
-+				crc_value = GetCrc16(packet_data,XMODEM_DATA_SIZE);
-+				frame_data[XMODEM_DATA_SIZE_SOH+3]=(unsigned char)(crc_value >> 8);
-+				frame_data[XMODEM_DATA_SIZE_SOH+4]=(unsigned char)(crc_value);
-+				write_number = write( fd, frame_data, XMODEM_DATA_SIZE_SOH + 5);
-+				printf("waiting for ACK,%d,%d,...",pack_counter,write_number);
-+				while((read(fd,&ack_id,1))<=0);
-+			
-+				if(ack_id == XMODEM_ACK)
-+					printf("Ok!\r\n");
-+				else
-+					printf("Error!\r\n");
-+			}
-+			else
-+			{
-+				ack_id = XMODEM_EOT;
-+				complete = 1;
-+				printf("Waiting for complete ACK ...");
-+			
-+				while(ack_id != XMODEM_ACK)
-+				{
-+					ack_id = XMODEM_EOT;	
-+					write_number=write(fd,&ack_id,1);
-+					while((read(fd,&ack_id,1))<=0);
-+				}
-+				printf("OK\r\n");
-+		
-+				printf("Sending file complete\r\n");
-+			}
-+		break;
-+
-+		case XMODEM_NAK:
-+			if( retry_num++ > 10) 
-+			{
-+				printf("Retry too many times,Quit!\r\n");
-+				complete = 1;
-+			}
-+			else
-+			{
-+				write_number = write(fd,frame_data,XMODEM_DATA_SIZE + 5);
-+				printf("Retry for ACK,%d,%d...",pack_counter,write_number);
-+				while((read(fd,&ack_id,1))<=0);
-+				
-+				if( ack_id == XMODEM_ACK )
-+					printf("OK\r\n");
-+				else
-+					printf("Error!\r\n");
-+			}
-+		break;
-+
-+		default:
-+			printf("Fatal Error!\r\n");
-+			complete = 1;
-+		break;
-+		}
-+
-+	}
-+
-+	fclose(datafile);
-+	close(fd);
-+
-+	return 0;
-+}
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-008-Makefile.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-008-Makefile.patch
deleted file mode 100644
index 176eed55d..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-008-Makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -urN u-boot-2008.10-0rig//Makefile u-boot-2008.10/Makefile
---- u-boot-2008.10-0rig//Makefile	2008-12-31 18:11:18.000000000 +0100
-+++ u-boot-2008.10/Makefile	2008-12-31 18:39:58.000000000 +0100
-@@ -20,6 +20,7 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- # MA 02111-1307 USA
- #
-+BUILD_DATE= $(shell date +%F)
- 
- VERSION = 2008
- PATCHLEVEL = 10
-@@ -294,6 +295,22 @@
- ALL += $(obj)u-boot.ldr
- endif
- 
-+ifneq ($(BOARDNAME),)
-+BINARY := $(BOARDNAME)-u-boot-$(U_BOOT_VERSION)-$(BUILD_DATE)
-+BINARY_BIN := $(obj)$(BINARY).bin
-+BINARY_GZ  := $(obj)$(BINARY).gz
-+ALL += $(BINARY_BIN)
-+ALL += $(BINARY_GZ)
-+else
-+BINARY := u-boot
-+BINARY_BIN := $(obj)$(BINARY).bin
-+BINARY_GZ  := $(obj)$(BINARY).gz
-+endif
-+
-+ifeq ($(DESTDIR),)
-+DESTDIR=binaries
-+endif
-+
- all:		$(ALL)
- 
- $(obj)u-boot.hex:	$(obj)u-boot
-@@ -302,9 +319,20 @@
- $(obj)u-boot.srec:	$(obj)u-boot
- 		$(OBJCOPY) -O srec $< $@
- 
--$(obj)u-boot.bin:	$(obj)u-boot
-+$(BINARY_BIN):	$(obj)u-boot
- 		$(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
- 
-+$(BINARY_GZ):	$(BINARY_BIN)
-+		gzip -c $(BINARY_BIN) > $(BINARY_GZ)
-+
-+install:	all
-+		-install -d	$(DESTDIR)
-+		install		$(BINARY_BIN)	$(DESTDIR)
-+
-+tftp:		install
-+		cp $(BINARY_GZ)				$(TFTPBOOT)/$(BINARY).gz
-+		cp $(BINARY_BIN) 			$(TFTPBOOT)/$(BINARY).bin
-+
- $(obj)u-boot.ldr:	$(obj)u-boot
- 		$(LDR) -T $(CONFIG_BFIN_CPU) -f -c $@ $< $(LDR_FLAGS)
- 
-@@ -3295,6 +3324,7 @@
- 		-o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
- 		-print0 \
- 		| xargs -0 rm -f
-+	@rm -f $(obj)u-boot-*.gz
- 	@rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
- 		$(obj)cscope.* $(obj)*.*~
- 	@rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch
deleted file mode 100644
index 7d1c958dc..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-009-factory.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-diff -urN u-boot-2009.01-0rig//common/cmd_factory.c u-boot-2009.01/common/cmd_factory.c
---- u-boot-2009.01-0rig//common/cmd_factory.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/common/cmd_factory.c	2009-01-02 19:32:07.000000000 +0100
-@@ -0,0 +1,308 @@
-+/*
-+ * (C) Copyright 2000
-+ * Ulf Samuelsson	<ulf.samuelsson@atmelcom>.
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+/*
-+ * Boot support
-+ */
-+#include <config.h>
-+#include <common.h>
-+#include <command.h>
-+#include <dataflash.h>
-+
-+/* 
-+ * 
-+ * The typical use of this file, is to update config.h
-+ * from an external build system
-+ * 
-+ */
-+
-+
-+/*
-+ * Macros to transform values
-+ * into environment strings.
-+ */
-+#define XMK_STR(x)		#x
-+#define MK_STR(x)		XMK_STR(x)
-+
-+void		setargs(void);
-+
-+int do_factory_defaults (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-+{
-+#if	defined(CONFIG_ETHADDR)
-+	setenv("ethaddr",	MK_STR(CONFIG_ETHADDR));
-+#endif
-+#if	defined(CONFIG_ETH1ADDR)
-+	setenv("eth1addr",	MK_STR(CONFIG_ETH1ADDR));
-+#endif
-+#if	defined(CONFIG_HOSTNAME)
-+	setenv("hostname",	MK_STR(CONFIG_HOSTNAME));
-+#endif
-+#if	defined(CONFIG_IPADDR)
-+	setenv("ipaddr",	MK_STR(CONFIG_IPADDR));
-+#endif
-+#if	defined(CONFIG_SERVERIP)
-+	setenv("serverip",	MK_STR(CONFIG_SERVERIP));
-+#endif
-+#if	defined(CONFIG_GATEWAY)
-+	setenv("gatewayip",	MK_STR(CONFIG_GATEWAY));
-+#endif
-+#if	defined(CONFIG_NETMASK)
-+	setenv("netmask",	MK_STR(CONFIG_NETMASK));
-+#endif
-+#if	defined(KERNEL_START)
-+	setenv("kernel",	MK_STR(KERNEL_START));
-+#endif
-+#if	defined(KERNEL_LOCATION)
-+	setenv("OS",		MK_STR(KERNEL_LOCATION));
-+#endif
-+#if	defined(FILESYSTEM_START)
-+	setenv("ramdisk",	MK_STR(FILESYSTEM_START));
-+	setenv("initrd",	MK_STR(FILESYSTEM_START)","MK_STR(FILESYSTEM_SIZE));
-+#endif
-+#if	defined(FILESYSTEM_LOCATION)
-+	setenv("FS",		MK_STR(FS_LOCATION));
-+#endif
-+#if	defined(END_OF_FLASH)
-+	setenv("endflash",	MK_STR(END_OF_FLASH));
-+#endif
-+#if	defined(CONFIG_LOAD_SCRIPTS)
-+	/* By updating the "fs-date" environment variable and running "fs"
-+	   You set "rd-1" and "rd-2"
-+	*/ 
-+	setenv("rd-1",		"rootfs.arm-"MK_STR(DATE)".ext2");
-+	setenv("rd-2",		"rootfs.arm-"MK_STR(DATE)".jffs2");
-+	setenv("rd-3",		"rootfs.arm-linux.ext2");
-+	setenv("rd-4",		"rootfs.arm-linux.jffs2");
-+	setenv("ver",		"1");
-+
-+	setenv("config",	"tftp  ${ramdisk} autoscript.${hostname} ; autoscr ${ramdisk} ");
-+
-+#if	defined(KERNEL_VERSION)
-+	setenv("kernel-version",MK_STR(KERNEL_VERSION));
-+#endif
-+#if	defined(DATE)
-+	setenv("kernel-date",	MK_STR(DATE));
-+	setenv("fs-date",	MK_STR(DATE));
-+	setenv("rd",		"rootfs.arm-"MK_STR(DATE)".ext2");
-+#endif
-+#if	defined(KERNEL_VERSION)
-+	setenv("linux",		MK_STR(BOARD_NAME)"-linux-"MK_STR(KERNEL_VERSION)"-"MK_STR(DATE)".gz");
-+#endif
-+	setenv("get-ramdisk",	"tftp	${ramdisk}	${rd};		setenv rd-size	${filesize}");
-+	setenv("store-ramdisk",	"cp.b	${ramdisk}	${FS}		${rd-size}");
-+	setenv("load-ramdisk",	"cp.b	${FS}		${ramdisk}	${rd-size}");
-+	setenv("flash-ramdisk",	"run	get-ramdisk;	run		store-ramdisk");
-+
-+	setenv("get-kernel",	"tftp	${kernel}	${linux};	setenv	kernel-size	${filesize}");
-+	setenv("store-kernel",	"cp.b	${kernel}	${OS}		${kernel-size};		saveenv");
-+	setenv("load-kernel",	"cp.b	${OS}		${kernel}	${kernel-size};		saveenv");
-+	setenv("flash-kernel",	"run	get-kernel;	run		store-kernel");
-+
-+	setenv("get",		"run get-kernel		; run get-ramdisk");
-+	setenv("flash",		"run flash-kernel	; run flash-ramdisk ; saveenv");
-+	setenv("load",		"run load-kernel	; run load-ramdisk");
-+
-+	setenv("bootcmd",	"run load ; bootm "MK_STR(KERNEL_START));
-+
-+	setenv("fstype",	"ram");
-+	setenv("flashfs",	"/dev/mtdblock2");
-+	setenv("ramfs",		"/dev/ram");
-+
-+	setenv("rootfstype",	"jffs2");
-+	setenv("access",	"rw");
-+	setenv("ramdisk_size",	"15360");
-+	setenv("console",	"ttyS0,115200");
-+
-+
-+#if	defined(MEMORY_SIZE)
-+	setenv("mem",		MK_STR(MEMORY_SIZE));
-+#else
-+	setenv("mem",		"32M");	/* Cautious default */
-+#endif
-+
-+	setenv("update",	"os; fs; setargs");
-+	setenv("cmpk",		"run flash-kernel; cp.b ${OS} ${ramdisk} ${kernel-size}; cmp ${kernel} ${ramdisk} ${kernel-size}"); 
-+#endif	/* CONFIG_LOAD_SCRIPTS */
-+#if	defined(CONFIG_AT91RM9200)
-+	setenv("machid24",	"0x0fb");
-+	setenv("machid26",	"0x2c1");
-+	setenv("machid",	"0x2c1");
-+	setenv("k24",		"setenv machid ${machid24}; os");
-+	setenv("k26",		"setenv machid ${machid26}; os");
-+#endif
-+	AT91F_DataflashSetEnv ();
-+#if	defined(CONFIG_LOAD_SCRIPTS)
-+	setargs();
-+#endif
-+	return (saveenv() ? 1 : 0);
-+}
-+
-+
-+
-+U_BOOT_CMD(
-+	factory,	1,	1,	do_factory_defaults,
-+	"factory\t- Create a default environment\n",
-+	"\n"
-+);
-+
-+#if	defined(CONFIG_LOAD_SCRIPTS)
-+void		setargs(void)
-+{
-+	char cmd[512];
-+	char fstype[512];
-+
-+	sprintf(fstype,getenv("fstype"));
-+	if((fstype[0] != 'f') && (fstype[0] != 'r')) {
-+		fstype[0] = 'r';
-+	}
-+
-+	if(fstype[0] == 'f') {
-+		sprintf(cmd,"root=%s rootfstype=%s ip=%s:%s:%s:%s console=%s,mem=%s",
-+			getenv("flashfs"),
-+			getenv("rootfstype"),
-+			getenv("ipaddr"),
-+			getenv("serverip"),
-+			getenv("gatewayip"),
-+			getenv("netmask"),
-+			getenv("console"),
-+			getenv("mem")
-+		);
-+		cmd[511] = '\0';
-+		printf("len=%d: %s\n",strlen(cmd),cmd);
-+		if(strlen(cmd) > 500) {
-+			printf("Error: Environment too large during 'setargs'\n");
-+		} else {
-+			setenv("bootargs",cmd);
-+			setenv("bootcmd",	"run load-kernel ; bootm 21000000");
-+		}
-+	} else if(fstype[0] == 'r') {
-+		sprintf(cmd,"root=%s %s initrd=%s ramdisk_size=%s ip=%s:%s:%s:%s console=%s,mem=%s",
-+			getenv("ramfs"),
-+			getenv("access"),
-+			getenv("initrd"),
-+			getenv("ramdisk_size"),
-+			getenv("ipaddr"),
-+			getenv("serverip"),
-+			getenv("gatewayip"),
-+			getenv("netmask"),
-+			getenv("console"),
-+			getenv("mem")
-+		);
-+		printf("len=%d: %s\n",strlen(cmd),cmd);
-+		cmd[511] = '\0';
-+		if(strlen(cmd) > 500) {
-+			printf("Error: Environment too large during 'setargs'\n");
-+		} else {
-+			setenv("bootargs",cmd);
-+			setenv("bootcmd",	"run load ; bootm 21000000");
-+		}
-+	} else {
-+		setenv("bootargs","no args");
-+	}
-+}
-+
-+int do_setargs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-+{
-+	setargs();
-+	return 0;
-+}
-+
-+U_BOOT_CMD(
-+	setargs,	1,	1,	do_setargs,
-+	"setargs\t- Create a bootargs from:"
-+	"fstype=flash:	(${flash} ${access} ${initrd} ${ramdisk_size}) "
-+	"fstype=ram:	(${ram}   ${access} ${initrd} ${ramdisk_size}) "
-+	"${ipaddr} ${serverip} ${gatewayip} ${netmask} "
-+	"${console} ${mem}\n"
-+	,	"\n"
-+);
-+
-+int do_os (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-+{
-+	char *kchip;
-+	char *kdate;
-+	char *kver;
-+	char cmd[512];
-+	kchip = getenv("hostname");
-+	kdate = getenv("kernel-date");
-+	kver = getenv("kernel-version");
-+	if((strlen(kdate) + strlen(kver) + 32) >  500) {
-+		printf("Error: Environment too large during 'os': ");
-+		printf("len=%d\n", strlen(kdate) + strlen(kver) + 32);
-+	} else if(kver != NULL) {
-+		if(kdate != NULL) {
-+			sprintf(cmd,"%s-linux-%s-%s.gz",kchip,kver,kdate);
-+		} else {
-+			sprintf(cmd,"%s-linux-%s.gz",kchip,kver);
-+		}
-+		printf("Setting kernel to %s\n",cmd);
-+		setenv("linux",cmd);
-+		return 0;
-+	}
-+	return 1;
-+}
-+
-+U_BOOT_CMD(
-+	os,	1,	1,	do_os,
-+	"os\t- Select linux version  ${hostname}-linux-${kernel-name}-${kernel-date}\n"
-+	,	"\n"
-+);
-+
-+
-+int do_fs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-+{
-+	char *ver;
-+	char *fsdate;
-+	char *hostname;
-+	char cmd[512];
-+	fsdate		= getenv("fs-date");
-+	hostname	= getenv("hostname");
-+
-+	if(fsdate != NULL) {
-+		sprintf(cmd,"rootfs.arm-%s.ext2",fsdate);
-+		setenv("rd-1",cmd);
-+		sprintf(cmd,"rootfs.arm-%s.jffs2",fsdate);
-+		setenv("rd-2",cmd);
-+	}
-+	ver = getenv("ver");		/* Find out which version we are using*/
-+	if(cmd==NULL) {
-+		setenv("ver","1");
-+	}
-+	ver = getenv("ver");		/* Find out which version we are using*/
-+	sprintf(cmd,"rd-%s",ver);	/* create rd${ver}*/
-+	ver=getenv(cmd);
-+	sprintf(cmd,"%s",ver);
-+	printf("Setting ramdisk to %s\n",cmd);
-+	setenv("rd",cmd);
-+	return 0;
-+}
-+
-+
-+U_BOOT_CMD(
-+	fs,	1,	1,	do_fs,
-+	"fs\t- Select ramdisk version == rd-${ver}\n"
-+	,	"\n"
-+);
-+#endif /* #if	defined(CONFIG_LOAD_SCRIPTS) */
-+
-+
-diff -urN u-boot-2009.01-0rig//common/Makefile u-boot-2009.01/common/Makefile
---- u-boot-2009.01-0rig//common/Makefile	2008-12-16 23:48:27.000000000 +0100
-+++ u-boot-2009.01/common/Makefile	2009-01-02 19:17:16.000000000 +0100
-@@ -84,6 +84,7 @@
- COBJS-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o
- COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
- COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
-+COBJS-$(CONFIG_CMD_FACTORY) += cmd_factory.o
- COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
- COBJS-$(CONFIG_CMD_FDC)$(CONFIG_CMD_FDOS) += cmd_fdc.o
- COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-010-coloured_led.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-010-coloured_led.patch
deleted file mode 100644
index 5c1d29dce..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-010-coloured_led.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff -urN u-boot-2009.01-0rig//common/cmd_led.c u-boot-2009.01/common/cmd_led.c
---- u-boot-2009.01-0rig//common/cmd_led.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/common/cmd_led.c	2009-01-03 23:39:57.000000000 +0100
-@@ -0,0 +1,84 @@
-+/*
-+ * (C) Copyright 2008
-+ * Ulf Samuelsson <ulf.samuelsson@atmel.com>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+/*
-+ * This file provides a shell like 'test' function to return
-+ * true/false from an integer or string compare of two memory
-+ * locations or a location and a scalar/literal.
-+ * A few parts were lifted from bash 'test' command
-+ */
-+
-+#include <common.h>
-+#include <config.h>
-+#include <command.h>
-+#include <coloured_led.h>
-+
-+int do_led ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
-+{
-+	int	led;
-+	/* Validate arguments */
-+	if ((argc != 3)){
-+		printf("Usage:\n%s\n", cmdtp->usage);
-+		return 1;
-+	}
-+	if (strcmp(argv[1], "1") == 0) {
-+		led = (1 << 0);
-+	} else if (strcmp(argv[1], "2") == 0) {
-+		led = (1 << 1);
-+	} else if (strcmp(argv[1], "3") == 0) {
-+		led = (1 << 2);
-+	} else if (strcmp(argv[1], "green") == 0) {
-+		led = (1 << 0);
-+	} else if (strcmp(argv[1], "yellow") == 0) {
-+		led = (1 << 1);
-+	} else if (strcmp(argv[1], "red") == 0) {
-+		led = (1 << 2);
-+	} else if (strcmp(argv[1], "all") == 0) {
-+		led = 7;
-+	} else {
-+		printf ("Usage:\n%s\n", cmdtp->usage);
-+		return 1;
-+	}
-+
-+	if (strcmp(argv[2], "off") == 0) {
-+		if(led & 1) green_LED_off();
-+		if(led & 2) yellow_LED_off();
-+		if(led & 4) red_LED_off();		
-+	} else if (strcmp(argv[2], "on") == 0) {
-+		if(led & 1) green_LED_on();
-+		if(led & 2) yellow_LED_on();
-+		if(led & 4) red_LED_on();		
-+	} else {
-+		printf ("Usage:\n%s\n", cmdtp->usage);
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+U_BOOT_CMD(
-+	led, 3, 1, do_led,
-+	"led\t- [1|2|3|green|yellow|red|all] [on|off]\n",
-+	"led [1|2|3|green|yellow|red|all] [on|off] sets /clears led 1,2,3\n"
-+);
-+
-diff -urN u-boot-2009.01-0rig//common/Makefile u-boot-2009.01/common/Makefile
---- u-boot-2009.01-0rig//common/Makefile	2009-01-02 21:18:24.000000000 +0100
-+++ u-boot-2009.01/common/Makefile	2009-01-03 23:41:53.000000000 +0100
-@@ -99,6 +99,7 @@
- COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o
- COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o
- COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o
-+COBJS-$(CONFIG_CMD_LED) += cmd_led.o
- COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o
- COBJS-y += cmd_load.o
- COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
-diff -urN u-boot-2009.01-0rig//include/coloured_led.h u-boot-2009.01/include/coloured_led.h
---- u-boot-2009.01-0rig//include/coloured_led.h	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/include/coloured_led.h	2009-01-03 23:39:19.000000000 +0100
-@@ -0,0 +1,62 @@
-+/*
-+ * (C) Copyright 2008
-+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-+ * 
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+/*
-+ * The purpose of this code is to signal the operational status of a
-+ * target which usually boots over the network; while running in
-+ * PCBoot, a status LED is blinking. As soon as a valid BOOTP reply
-+ * message has been received, the LED is turned off. The Linux
-+ * kernel, once it is running, will start blinking the LED again,
-+ * with another frequency.
-+ */
-+
-+#ifndef _COLOURED_LED_H_
-+#define	_COLOURED_LED_H_
-+
-+#ifdef CONFIG_COLOURED_LED
-+
-+/*
-+ * Coloured LEDs API
-+ */
-+#ifndef	__ASSEMBLY__
-+extern void	coloured_LED_init (void);
-+extern void	red_LED_on(void);
-+extern void	red_LED_off(void);
-+extern void	green_LED_on(void);
-+extern void	green_LED_off(void);
-+extern void	yellow_LED_on(void);
-+extern void	yellow_LED_off(void);
-+#else
-+	.extern LED_init
-+	.extern red_LED_on
-+	.extern red_LED_off
-+	.extern yellow_LED_on
-+	.extern yellow_LED_off
-+	.extern green_LED_on
-+	.extern green_LED_off
-+#endif
-+
-+#endif	/* CONFIG_COLOURED_LED	*/
-+
-+#endif	/* _STATUS_COLOURED_H_	*/
-+
-diff -urN u-boot-2009.01-0rig//include/status_led.h u-boot-2009.01/include/status_led.h
---- u-boot-2009.01-0rig//include/status_led.h	2008-12-16 23:48:27.000000000 +0100
-+++ u-boot-2009.01/include/status_led.h	2009-01-03 23:44:40.000000000 +0100
-@@ -383,27 +383,6 @@
- # include <asm/status_led.h>
- #endif
- 
--/*
-- * Coloured LEDs API
-- */
--#ifndef	__ASSEMBLY__
--extern void	coloured_LED_init (void);
--extern void	red_LED_on(void);
--extern void	red_LED_off(void);
--extern void	green_LED_on(void);
--extern void	green_LED_off(void);
--extern void	yellow_LED_on(void);
--extern void	yellow_LED_off(void);
--#else
--	.extern LED_init
--	.extern red_LED_on
--	.extern red_LED_off
--	.extern yellow_LED_on
--	.extern yellow_LED_off
--	.extern green_LED_on
--	.extern green_LED_off
--#endif
--
- #endif	/* CONFIG_STATUS_LED	*/
- 
- #endif	/* _STATUS_LED_H_	*/
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-011-spimux.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-011-spimux.patch
deleted file mode 100644
index 8ab469fd8..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-011-spimux.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -urN u-boot-2009.01-0rig//common/cmd_mux.c u-boot-2009.01/common/cmd_mux.c
---- u-boot-2009.01-0rig//common/cmd_mux.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/common/cmd_mux.c	2009-01-04 00:17:19.000000000 +0100
-@@ -0,0 +1,78 @@
-+/*
-+ * (C) Copyright 2008
-+ * Ulf Samuelsson <ulf.samuelsson@atmel.com>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <common.h>
-+#include <command.h>
-+#if (defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF))
-+
-+#include <asm/arch/AT91RM9200.h>
-+#include <dataflash.h>
-+#include <at45.h>
-+
-+
-+static int mmc_nspi (const char *s)
-+{
-+	if (strcmp(s, "mmc") == 0) {
-+		return (1);
-+	} else if (strcmp(s, "spi") == 0) {
-+		return (0);
-+	}
-+	return (-1);
-+}
-+
-+int do_mux ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-+{
-+	switch (argc) {
-+	case 2:			/* on / off	*/
-+		switch (mmc_nspi(argv[1])) {
-+#if 0	/* prevented by varargs handling; FALLTROUGH is harmless, too */
-+		default: printf ("Usage:\n%s\n", cmdtp->usage);
-+			return;
-+#endif
-+		case 0:	AT91F_SelectSPI ();
-+			break;
-+		case 1:	AT91F_SelectMMC ();
-+			break;
-+		}
-+		/* FALL TROUGH */
-+	case 1:			/* get status */
-+		printf ("Mux is configured to be %s\n",
-+			AT91F_GetMuxStatus() ? "MMC" : "SPI");
-+		return 0;
-+	default:
-+		printf ("Usage:\n%s\n", cmdtp->usage);
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+
-+U_BOOT_CMD(
-+	mux,   2,   1,     do_mux,
-+	"mux\t- enable or disable MMC or SPI\n",
-+	"[mmc, spi]\n"
-+	"    - enable or disable MMC or SPI\n"
-+);
-+
-+#endif	/* CONFIG_CMD_MUX */
-+
-diff -urN u-boot-2009.01-0rig//common/Makefile u-boot-2009.01/common/Makefile
---- u-boot-2009.01-0rig//common/Makefile	2009-01-04 00:10:28.000000000 +0100
-+++ u-boot-2009.01/common/Makefile	2009-01-04 00:20:39.000000000 +0100
-@@ -112,6 +112,7 @@
- COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o
- COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
- COBJS-$(CONFIG_MP) += cmd_mp.o
-+COBJS-$(CONFIG_CMD_AT91_SPIMUX) += cmd_mux.o
- COBJS-y += cmd_nand.o
- COBJS-$(CONFIG_CMD_NET) += cmd_net.o
- COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-012-ethinit.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-012-ethinit.patch
deleted file mode 100644
index c2f709c70..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-012-ethinit.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -urN u-boot-2009.01-0rig//common/cmd_ethinit.c u-boot-2009.01/common/cmd_ethinit.c
---- u-boot-2009.01-0rig//common/cmd_ethinit.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-2009.01/common/cmd_ethinit.c	2009-01-04 00:28:39.000000000 +0100
-@@ -0,0 +1,62 @@
-+/*
-+ * (C) Copyright 2000
-+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+/*
-+ * Boot support
-+ */
-+#include <common.h>
-+#include <command.h>
-+#include <net.h>
-+#ifdef CONFIG_CMD_ETHINIT
-+extern int eth_init (bd_t * bd);
-+
-+static void	delay(void)
-+{
-+}
-+/* 
-+ * This command allows you to delay booting until you have a 
-+ * valid Ethernet connection.
-+ * Neccessary if you want to NFS mount a rootfs etc.
-+ * When both this target and the NFS server 
-+ * are powered on at the same time, then the NFS
-+ * server can take a long time to boot.
-+ */
-+int do_ethinit (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-+{
-+	int	i;
-+	DECLARE_GLOBAL_DATA_PTR;
-+	while(eth_init (gd->bd) == 0) {
-+		for(i = 0; i < 10000000; i ++) {
-+			delay();
-+		}
-+	}
-+	return 0;
-+}
-+
-+U_BOOT_CMD(
-+	ethinit,	1,	1,	do_ethinit,
-+	"ethinit\t- Initialize Ethernet controller\n",
-+	"\n"
-+);
-+
-+#endif	/* CONFIG_CMD_ETHINIT */
-diff -urN u-boot-2009.01-0rig//common/Makefile u-boot-2009.01/common/Makefile
---- u-boot-2009.01-0rig//common/Makefile	2009-01-04 00:22:06.000000000 +0100
-+++ u-boot-2009.01/common/Makefile	2009-01-04 00:29:46.000000000 +0100
-@@ -83,6 +83,7 @@
- COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o
- COBJS-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o
- COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
-+COBJS-$(CONFIG_CMD_ETHINIT) += cmd_ethinit.o
- COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
- COBJS-$(CONFIG_CMD_FACTORY) += cmd_factory.o
- COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-013-configs.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-013-configs.patch
deleted file mode 100644
index e65645b69..000000000
--- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-013-configs.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -urN u-boot-2009.01-0rig//include/configs/at91cap9adk.h u-boot-2009.01/include/configs/at91cap9adk.h
---- u-boot-2009.01-0rig//include/configs/at91cap9adk.h	2008-12-16 23:48:27.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91cap9adk.h	2009-01-04 00:43:58.000000000 +0100
-@@ -69,7 +69,9 @@
- #define CONFIG_ATMEL_LCD		1
- #define CONFIG_ATMEL_LCD_BGR555		1
- #define CONFIG_SYS_CONSOLE_IS_IN_ENV		1
--
-+#define CONFIG_CMD_FACTORY
-+#define CONFIG_CMD_LED
-+#define CONFIG_COLOURED_LED
- #define CONFIG_BOOTDELAY	3
- 
- /*
-diff -urN u-boot-2009.01-0rig//include/configs/at91rm9200df.h u-boot-2009.01/include/configs/at91rm9200df.h
---- u-boot-2009.01-0rig//include/configs/at91rm9200df.h	2009-01-02 17:37:43.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91rm9200df.h	2009-01-04 00:43:33.000000000 +0100
-@@ -123,6 +123,9 @@
- #define CONFIG_CMD_DHCP
- #define CONFIG_CMD_MII
- #define CONFIG_CMD_NAND
-+#define CONFIG_CMD_FACTORY
-+#define CONFIG_CMD_LED
-+#define CONFIG_COLOURED_LED
- #define CONFIG_CMD_AT91_SPIMUX
- #define CONFIG_CMD_ETHINIT
- 
-diff -urN u-boot-2009.01-0rig//include/configs/at91rm9200dk_df.h u-boot-2009.01/include/configs/at91rm9200dk_df.h
---- u-boot-2009.01-0rig//include/configs/at91rm9200dk_df.h	2009-01-02 10:03:11.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91rm9200dk_df.h	2009-01-04 00:42:52.000000000 +0100
-@@ -122,7 +122,11 @@
- #define CONFIG_CMD_DHCP
- #define CONFIG_CMD_MII
- #define CONFIG_CMD_NAND
-+#define CONFIG_CMD_FACTORY
-+#define CONFIG_CMD_LED
-+#define CONFIG_COLOURED_LED
- #define CONFIG_CMD_AT91_SPIMUX
-+#define CONFIG_CMD_ETHINIT
- 
- #define CONFIG_NAND_LEGACY
- 
-diff -urN u-boot-2009.01-0rig//include/configs/at91rm9200dk.h u-boot-2009.01/include/configs/at91rm9200dk.h
---- u-boot-2009.01-0rig//include/configs/at91rm9200dk.h	2009-01-02 10:03:11.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91rm9200dk.h	2009-01-04 00:43:15.000000000 +0100
-@@ -120,7 +120,11 @@
- #define CONFIG_CMD_DHCP
- #define CONFIG_CMD_MII
- #define CONFIG_CMD_NAND
-+#define CONFIG_CMD_FACTORY
-+#define CONFIG_CMD_LED
-+#define CONFIG_COLOURED_LED
- #define CONFIG_CMD_AT91_SPIMUX
-+#define CONFIG_CMD_ETHINIT
- 
- #define CONFIG_NAND_LEGACY
- 
-diff -urN u-boot-2009.01-0rig//include/configs/at91rm9200ek.h u-boot-2009.01/include/configs/at91rm9200ek.h
---- u-boot-2009.01-0rig//include/configs/at91rm9200ek.h	2009-01-02 17:37:43.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91rm9200ek.h	2009-01-04 00:42:35.000000000 +0100
-@@ -121,9 +121,11 @@
- #define CONFIG_CMD_DHCP
- #define CONFIG_CMD_MII
- #define CONFIG_CMD_NAND
-+#define CONFIG_CMD_FACTORY
-+#define CONFIG_CMD_LED
-+#define CONFIG_COLOURED_LED
- #define CONFIG_CMD_AT91_SPIMUX
- #define CONFIG_CMD_ETHINIT
--
- #define CONFIG_NAND_LEGACY
- 
- #define CONFIG_SYS_MAX_NAND_DEVICE	1	/* Max number of NAND devices		*/
-diff -urN u-boot-2009.01-0rig//include/configs/at91sam9260ek.h u-boot-2009.01/include/configs/at91sam9260ek.h
---- u-boot-2009.01-0rig//include/configs/at91sam9260ek.h	2008-12-16 23:48:27.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91sam9260ek.h	2009-01-04 00:41:56.000000000 +0100
-@@ -74,10 +74,13 @@
- #include <config_cmd_default.h>
- #undef CONFIG_CMD_BDI
- #undef CONFIG_CMD_IMI
--#undef CONFIG_CMD_AUTOSCRIPT
-+#define CONFIG_CMD_AUTOSCRIPT
- #undef CONFIG_CMD_FPGA
- #undef CONFIG_CMD_LOADS
- #undef CONFIG_CMD_IMLS
-+#define CONFIG_CMD_FACTORY
-+#define CONFIG_CMD_LED
-+#define CONFIG_COLOURED_LED
- 
- #define CONFIG_CMD_PING		1
- #define CONFIG_CMD_DHCP		1
-diff -urN u-boot-2009.01-0rig//include/configs/at91sam9261ek.h u-boot-2009.01/include/configs/at91sam9261ek.h
---- u-boot-2009.01-0rig//include/configs/at91sam9261ek.h	2008-12-16 23:48:27.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91sam9261ek.h	2009-01-04 00:44:11.000000000 +0100
-@@ -68,6 +68,9 @@
- #define CONFIG_ATMEL_LCD		1
- #define CONFIG_ATMEL_LCD_BGR555		1
- #define CONFIG_SYS_CONSOLE_IS_IN_ENV		1
-+#define CONFIG_CMD_FACTORY
-+#define CONFIG_CMD_LED
-+#define CONFIG_COLOURED_LED
- 
- #define CONFIG_BOOTDELAY	3
- 
-diff -urN u-boot-2009.01-0rig//include/configs/at91sam9263ek.h u-boot-2009.01/include/configs/at91sam9263ek.h
---- u-boot-2009.01-0rig//include/configs/at91sam9263ek.h	2008-12-16 23:48:27.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91sam9263ek.h	2009-01-04 00:44:34.000000000 +0100
-@@ -69,6 +69,9 @@
- #define CONFIG_ATMEL_LCD		1
- #define CONFIG_ATMEL_LCD_BGR555		1
- #define CONFIG_SYS_CONSOLE_IS_IN_ENV		1
-+#define CONFIG_CMD_FACTORY
-+#define CONFIG_CMD_LED
-+#define CONFIG_COLOURED_LED
- 
- #define CONFIG_BOOTDELAY	3
- 
-diff -urN u-boot-2009.01-0rig//include/configs/at91sam9rlek.h u-boot-2009.01/include/configs/at91sam9rlek.h
---- u-boot-2009.01-0rig//include/configs/at91sam9rlek.h	2008-12-16 23:48:27.000000000 +0100
-+++ u-boot-2009.01/include/configs/at91sam9rlek.h	2009-01-04 00:44:54.000000000 +0100
-@@ -68,6 +68,9 @@
- #define CONFIG_ATMEL_LCD		1
- #define CONFIG_ATMEL_LCD_RGB565		1
- #define CONFIG_SYS_CONSOLE_IS_IN_ENV		1
-+#define CONFIG_CMD_FACTORY
-+#define CONFIG_CMD_LED
-+#define CONFIG_COLOURED_LED
- 
- #define CONFIG_BOOTDELAY	3
- 
diff --git a/target/device/Atmel/arch-arm/u-boot/Config.in b/target/device/Atmel/arch-arm/u-boot/Config.in
deleted file mode 100644
index 6d32e7867..000000000
--- a/target/device/Atmel/arch-arm/u-boot/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-choice
-	prompt "Add AT91 specific patches to u-Boot"
-	default BR2_TARGET_U_BOOT_2009_01_ARCH_AT91
-	help
-	  Select a patch to add to U-Boot
-
-config	BR2_TARGET_U_BOOT_2009_01_ARCH_AT91
-	bool "AT91 patches for u-boot-2009.01"
-	depends on BR2_TARGET_ATMEL && BR2_arm
-	depends on BR2_TARGET_UBOOT_2009_01
-	help
-	  Apply the at91 u-boot-2009.01 patches
-
-endchoice
-
-config	BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR
-	string
-	depends on BR2_TARGET_U_BOOT_ARCH_PATCH
-	default "target/device/Atmel/arch-arm/u-boot/2009.01" if BR2_TARGET_U_BOOT_2009_01_ARCH_AT91
-	default ""
-
diff --git a/target/device/Atmel/arch-arm/u-boot/Makefile.in b/target/device/Atmel/arch-arm/u-boot/Makefile.in
deleted file mode 100644
index b5981e176..000000000
--- a/target/device/Atmel/arch-arm/u-boot/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-ifneq ($(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR),)
-U_BOOT_ARCH_PATCH_DIR:=$(call qstrip,$(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR))
-endif
-
diff --git a/target/device/Atmel/at91bootstrap/Config.in b/target/device/Atmel/at91bootstrap/Config.in
deleted file mode 100644
index 91e0b0887..000000000
--- a/target/device/Atmel/at91bootstrap/Config.in
+++ /dev/null
@@ -1,109 +0,0 @@
-menuconfig BR2_TARGET_AT91BOOTSTRAP
-	depends on BR2_TARGET_AT91SAM9260EK || BR2_TARGET_AT91SAM9260DFC || BR2_TARGET_AT91SAM9260PF || \
-	BR2_TARGET_AT91SAM9261EK || BR2_TARGET_AT91SAM9263EK || BR2_TARGET_AT91SAM9XEEK || BR2_TARGET_AT91SAM9G20DFC
-	bool "Build AT91 Bootstrap for selected chip"
-
-if	BR2_TARGET_AT91BOOTSTRAP
-
-config BR2_TARGET_AT91BOOTSTRAP_BOARD
-	string "Bootstrap board"
-	default "$(BOARD_NAME)"
-	help
-	  This is used to do a make <board>_config
-
-choice
-	prompt "Boot Memory"
-	default BR2_TARGET_AT91BOOT_DATAFLASHCARD
-	depends on BR2_TARGET_AT91BOOTSTRAP
-	help
-	  Select Chip for which AT91 bootstrap should be built
-
-config BR2_TARGET_AT91BOOT_DATAFLASH
-	bool "AT45 Dataflash"
-	depends on BR2_BOOTSOURCE_DATAFLASH
-
-config BR2_TARGET_AT91BOOT_DATAFLASHCARD
-	bool "AT45 Dataflash Card"
-	depends on BR2_BOOTSOURCE_DATAFLASHCARD
-
-config BR2_TARGET_AT91BOOT_NANDFLASH
-	bool "NAND Flash"
-	depends on BR2_BOOTSOURCE_NANDFLASH
-
-config BR2_TARGET_AT91BOOT_FLASH
-	bool "Internal Flash or external parallel flash"
-	depends on BR2_BOOTSOURCE_FLASH
-
-config BR2_TARGET_AT91BOOT_SDCARD
-	bool "SD-Card"
-	depends on BR2_BOOTSOURCE_SDCARD
-
-config BR2_TARGET_AT91BOOT_EEPROM
-	bool "EEPROM"
-	depends on BR2_BOOTSOURCE_EEPROM
-
-endchoice
-
-config BR2_TARGET_AT91BOOTSTRAP_MEMORY
-	string
-	depends on BR2_TARGET_AT91BOOTSTRAP
-	default	"dataflash"	if	BR2_TARGET_AT91BOOT_DATAFLASH
-	default	"dataflashcard"	if	BR2_TARGET_AT91BOOT_DATAFLASHCARD
-	default	"nandflash"	if	BR2_TARGET_AT91BOOT_NANDFLASH
-	default	"flash"		if	BR2_TARGET_AT91BOOT_FLASH
-	default	"sdcard"	if	BR2_TARGET_AT91BOOT_SDCARD
-	default	"eeprom"	if	BR2_TARGET_AT91BOOT_EEPROM
-
-config	BR2_AT91BOOTSTRAP_IMG_SIZE
-	string	"Image Size to copy to SDRAM"
-	depends on BR2_TARGET_AT91BOOTSTRAP
-	default	"0x32000"	if	BR2_TARGET_AT91BOOT_DATAFLASH
-	default	"0x32000"	if	BR2_TARGET_AT91BOOT_DATAFLASHCARD
-	default	"0x30000"	if	BR2_TARGET_AT91BOOT_NANDFLASH
-	default	"0x100000"	if	BR2_TARGET_AT91BOOT_FLASH
-	default	"0x30000"	if	BR2_TARGET_AT91BOOT_SDCARD
-	default	"0x30000"	if	BR2_TARGET_AT91BOOT_EEPROM
-	help
-	  Select the size of your application
-	  AT91 Bootstrap will copy this amount from flash to SDRAM
-
-choice
-	prompt "Start address of application"
-	default BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
-	depends on BR2_TARGET_AT91BOOTSTRAP
-	help
-	  Select Chip for which AT91 bootstrap should be built
-	  Currently supports AT91SAM9260EK, AT91SAM9261EK,
-	  AT91SAM9XEEK, AT91SAM9263EK
-
-
-config	BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
-	bool "Copy to the default U-Boot start location in the SDRAM"
-	help
-	  This is where you copy the U-Boot boot loader
-
-config	BR2_AT91BOOTSTRAP_JUMP_TO_HIGH_SDRAM
-	bool "Copy to the last Megabyte of the SDRAM"
-	help
-	  This is where you copy a boot loader
-
-config	BR2_AT91BOOTSTRAP_JUMP_TO_START_OF_SDRAM
-	bool "Copy to the start of the SDRAM"
-	help
-	  This is where you copy a standalone application
-endchoice
-
-config	BR2_AT91BOOTSTRAP_JUMP_ADDR
-	string
-	default	"0x23F00000" if BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
-	default	"0x23F00000" if BR2_AT91BOOTSTRAP_JUMP_TO_HIGH_SDRAM
-	default "0x20000000" if BR2_AT91BOOTSTRAP_JUMP_TO_START_OF_SDRAM
-	depends on BR2_TARGET_AT91BOOTSTRAP
-
-comment "It will be copied to $(BR2_AT91BOOTSTRAP_JUMP_ADDR)"
-	depends on BR2_TARGET_AT91BOOTSTRAP
-
-endif
-
-
-
diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk
deleted file mode 100644
index f681fa981..000000000
--- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk
+++ /dev/null
@@ -1,110 +0,0 @@
-#############################################################
-#
-# at91bootstrap
-#
-#############################################################
-AT91BOOTSTRAP_VERSION:=2.10
-AT91BOOTSTRAP_PATCH_LEVEL:=
-AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION)$(AT91BOOTSTRAP_PATCH_LEVEL)
-AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION)
-ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR))
-AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR)
-AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2
-AT91BOOTSTRAP_DIR:=$(BUILD_DIR)/$(AT91BOOTSTRAP_NAME)
-AT91BOOTSTRAP:=$(call qstrip,$(BR2_AT91BOOTSTRAP))
-AT91BOOTSTRAP_ZCAT:=$(BZCAT)
-
-AT91BOOTSTRAP_BOARD:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD))
-
-AT91BOOTSTRAP_MEMORY:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY))
-
-AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_PATCHED_VERSION).bin
-
-AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY)
-
-AT91BOOTSTRAP_JUMP_ADDR:=$(call qstrip,$(BR2_AT91BOOTSTRAP_JUMP_ADDR))
-AT91BOOTSTRAP_IMG_SIZE:=$(call qstrip,$(BR2_AT91BOOTSTRAP_IMG_SIZE))
-
-AT91_CUSTOM_FLAGS:=
-ifneq ($(AT91BOOTSTRAP_JUMP_ADDR),)
-AT91_CUSTOM_FLAGS+=-DJUMP_ADDR=$(AT91BOOTSTRAP_JUMP_ADDR)
-endif
-ifneq ($(AT91BOOTSTRAP_IMG_SIZE),)
-AT91_CUSTOM_FLAGS+=-DIMG_SIZE=$(AT91BOOTSTRAP_IMG_SIZE)
-endif
-
-$(DL_DIR)/$(AT91BOOTSTRAP_SOURCE):
-	 $(call DOWNLOAD,$(AT91BOOTSTRAP_SITE),$(AT91BOOTSTRAP_SOURCE))
-
-$(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
-	mkdir -p $(BUILD_DIR)
-	$(AT91BOOTSTRAP_ZCAT) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch
-	touch $(AT91BOOTSTRAP_DIR)/.unpacked
-
-$(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config
-	$(MAKE) \
-		MEMORY=$(AT91BOOTSTRAP_MEMORY) \
-		CROSS_COMPILE=$(TARGET_CROSS) \
-		-C $(AT91BOOTSTRAP_DIR) \
-		$(AT91BOOTSTRAP_BOARD)_defconfig
-	touch $(AT91BOOTSTRAP_DIR)/.configured
-
-#		$(BOARD_NAME)_defconfig
-
-$(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
-	$(MAKE) \
-		MEMORY=$(AT91BOOTSTRAP_MEMORY) \
-		CROSS_COMPILE=$(TARGET_CROSS) \
-		AT91_CUSTOM_FLAGS="$(AT91_CUSTOM_FLAGS)" \
-		-C $(AT91BOOTSTRAP_DIR)
-
-$(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET)
-	mkdir -p $(BINARIES_DIR)
-ifeq	($(AT91BOOTSTRAP_VERSION),2.3)
-	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-	$(call COPY_FILE, $(AT91BOOTSTRAP_TARGET), $(BR2_TARGET_ATMEL_COPYTO), $(AT91BOOTSTRAP_BINARY))
-else
-	make MEMORY=$(AT91BOOTSTRAP_MEMORY) \
-		CROSS_COMPILE=$(TARGET_CROSS) \
-		-C $(AT91BOOTSTRAP_DIR) boot
-	make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || \
-		echo "Could not copy bootstrap to BINARIES_DIR"
-ifneq ($(BR2_TARGET_ATMEL_COPYTO),)
-	make DESTDIR=$(BR2_TARGET_ATMEL_COPYTO) -C $(AT91BOOTSTRAP_DIR) install || \
-		echo "Could not copy bootstrap to BR2_ATMEL_COPYTO"
-endif
-endif
-	touch $@
-
-#	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-#	cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY)
-
-.PHONY: at91bootstrap at91bootstrap-source
-
-at91bootstrap: $(AT91BOOTSTRAP_DIR)/.installed
-
-at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
-
-at91bootstrap-unpacked: $(AT91BOOTSTRAP_DIR)/.unpacked
-
-.PHONY: at91bootstrap-clean at91bootstrap-dirclean
-
-at91bootstrap-clean:
-	make -C $(AT91BOOTSTRAP_DIR) clean
-
-at91bootstrap-dirclean:
-	rm -rf $(AT91BOOTSTRAP_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
-TARGETS+=at91bootstrap
-endif
-
-at91bootstrap-status:
-	@echo AT91BOOTSTRAP_BOARD=$(AT91BOOTSTRAP_BOARD)
-
diff --git a/target/device/Config.in.u-boot b/target/device/Config.in.u-boot
deleted file mode 100644
index d67aacfaf..000000000
--- a/target/device/Config.in.u-boot
+++ /dev/null
@@ -1,9 +0,0 @@
-menuconfig BR2_TARGET_U_BOOT_ARCH_PATCH
-	bool "Add architecture specific patch"
-	help
-	  Patch U-Boot for a specific family of chips
-
-if BR2_TARGET_U_BOOT_ARCH_PATCH
-source "target/device/Atmel/arch-arm/u-boot/Config.in"
-endif # BR2_TARGET_U_BOOT_ARCH_PATCH
-
diff --git a/target/linux/Config.in.advanced b/target/linux/Config.in.advanced
index d6c855944..645ed2e3a 100644
--- a/target/linux/Config.in.advanced
+++ b/target/linux/Config.in.advanced
@@ -383,7 +383,6 @@ config BR2_LINUX_BIN_BZIMAGE
 config BR2_LINUX_BIN_UIMAGE
 	bool "uImage"
 	depends on BR2_PACKAGE_LINUX
-	select BR2_TARGET_UBOOT
 
 config BR2_LINUX_BIN_VMLINUX
 	bool "vmlinux"
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 86d94ca40..9cbbd2c74 100644
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -123,7 +123,6 @@ endif
 # -----------------------------------------------------------------------------
 # Has to be set by the target/device
 
-LINUX26_MKIMAGE_DIR:=
 LINUX26_MKIMAGE_DEP:=
 
 # --------------
@@ -137,8 +136,7 @@ endif
 # --------------
 # UIMAGE
 ifeq ($(LINUX26_FORMAT),uImage)
-LINUX26_MKIMAGE_DIR:=$(BUILD_DIR)/u-boot-tools
-LINUX26_MKIMAGE_DEP:=$(LINUX26_MKIMAGE_DIR)/mkimage
+LINUX26_MKIMAGE_DEP:=$(MKIMAGE)
 ifeq ($(LINUX26_BINLOC),)
 LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
 endif
@@ -186,7 +184,7 @@ LINUX26_MAKE_FLAGS = HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \
 	CROSS_COMPILE=$(TARGET_CROSS) \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	LZMA="$(LZMA)" \
-	PATH=$(LINUX26_MKIMAGE_DIR):$(PATH)
+	PATH=$(PATH)
 
 # =============================================================================
 # ifneq ($(strip $(LINUX26_VERSION)),$(strip $(LINUX_HEADERS_VERSION)))
@@ -449,10 +447,6 @@ $(BUILD_DIR)/.linux-version: $(LINUX26_KERNEL)
 	echo $(LINUX26_VERSION_PROBED) > $(BUILD_DIR)/.linux-version
 	echo LINUX_MODULES=`$(LINUX26_VERSION_PROBED)`
 
-$(LINUX26_MKIMAGE_DIR)/mkimage:	$(U_BOOT_TOOLS)
-	mkdir -p $(LINUX26_MKIMAGE_DIR)
-	cp $(MKIMAGE) $(LINUX26_MKIMAGE_DIR)
-
 linux26: $(LINUX26_TARGETS)
 
 linux26-version: $(BUILD_DIR)/.linux-version
diff --git a/target/powerpc/Makefile.in b/target/powerpc/Makefile.in
deleted file mode 100644
index 0d4698d04..000000000
--- a/target/powerpc/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-include target/powerpc/*/*.mk
diff --git a/target/powerpc/yaboot/Config.in b/target/powerpc/yaboot/Config.in
deleted file mode 100644
index 75da815ab..000000000
--- a/target/powerpc/yaboot/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config BR2_TARGET_YABOOT
-	bool "yaboot"
-	depends on BR2_powerpc
-	help
-	  The yaboot bootloader for new world powerpc systems.
diff --git a/target/powerpc/yaboot/yaboot.mk b/target/powerpc/yaboot/yaboot.mk
deleted file mode 100644
index cbeae5086..000000000
--- a/target/powerpc/yaboot/yaboot.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-ifeq ($(ARCH),powerpc)
-
-#############################################################
-#
-# yaboot
-#
-#############################################################
-
-YABOOT_SOURCE:=yaboot-1.3.13.tar.gz
-YABOOT_SITE:=http://penguinppc.org/bootloaders/yaboot
-YABOOT_DIR:=$(BUILD_DIR)/yaboot-1.3.13
-
-$(DL_DIR)/$(YABOOT_SOURCE):
-	 $(call DOWNLOAD,$(YABOOT_SITE),$(YABOOT_SOURCE))
-
-yaboot-source: $(DL_DIR)/$(YABOOT_SOURCE)
-
-$(YABOOT_DIR)/Makefile: $(DL_DIR)/$(YABOOT_SOURCE)
-	$(ZCAT) $(DL_DIR)/$(YABOOT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	touch -c $(YABOOT_DIR)/Makefile
-
-$(YABOOT_DIR)/second/yaboot: $(YABOOT_DIR)/Makefile
-	$(MAKE) -C $(YABOOT_DIR) CROSS=$(TARGET_CROSS)
-	touch -c $(YABOOT_DIR)/second/yaboot
-
-yaboot: $(YABOOT_DIR)/second/yaboot
-
-yaboot-clean:
-	$(MAKE) -C $(YABOOT_DIR) clean
-
-yaboot-dirclean:
-	rm -rf $(YABOOT_DIR)
-
-endif
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_YABOOT),y)
-TARGETS+=yaboot
-endif
-
diff --git a/target/u-boot/Config.in b/target/u-boot/Config.in
deleted file mode 100644
index ca47e18f9..000000000
--- a/target/u-boot/Config.in
+++ /dev/null
@@ -1,378 +0,0 @@
-menuconfig BR2_TARGET_UBOOT
-	bool "Das U-Boot Boot Monitor"
-	help
-	  Build "Das U-Boot" Boot Monitor
-
-if BR2_TARGET_UBOOT
-config BR2_TARGET_UBOOT_BOARDNAME
-	string "board name"
-	default "$(BOARD_NAME)"
-	help
-	  One of U-Boot supported boards to be built.
-	  This will be suffixed with _config to meet U-Boot standard naming.
-
-choice
-	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2010_03
-	help
-	  Select the specific U-Boot version you want to use
-
-config BR2_TARGET_UBOOT_2010_03
-	bool "u-boot-2010.03"
-
-config BR2_TARGET_UBOOT_2009_11
-	bool "u-boot-2009.11"
-
-config BR2_TARGET_UBOOT_2009_08
-	bool "u-boot-2009.08"
-
-config BR2_TARGET_UBOOT_2009_06
-	bool "u-boot-2009.06"
-	depends on BR2_DEPRECATED
-
-config BR2_TARGET_UBOOT_2009_03
-	bool "u-boot-2009.03"
-	depends on BR2_DEPRECATED
-
-config BR2_TARGET_UBOOT_2009_01
-	bool "u-boot-2009.01"
-	depends on BR2_DEPRECATED
-
-config BR2_TARGET_UBOOT_2008_10
-	bool "u-boot-2008.10"
-	depends on BR2_DEPRECATED
-
-config BR2_TARGET_UBOOT_1_2_0_ATMEL
-	bool "u-boot-1.2.0-atmel"
-	depends on BR2_TARGET_AT91
-
-endchoice
-
-config BR2_UBOOT_VERSION
-	string
-	default "2010.03"	if BR2_TARGET_UBOOT_2010_03
-	default "2009.11"	if BR2_TARGET_UBOOT_2009_11
-	default "2009.08"	if BR2_TARGET_UBOOT_2009_08
-	default "2009.06"	if BR2_TARGET_UBOOT_2009_06
-	default "2009.03"	if BR2_TARGET_UBOOT_2009_03
-	default "2009.01"	if BR2_TARGET_UBOOT_2009_01
-	default "2008.10"	if BR2_TARGET_UBOOT_2008_10
-	default "1.2.0-atmel"	if BR2_TARGET_UBOOT_1_2_0_ATMEL
-
-config BR2_U_BOOT_SITE
-	string
-	default "$(BR2_ATMEL_MIRROR)"		if BR2_TARGET_UBOOT_1_2_0_ATMEL
-	default "ftp://ftp.denx.de/pub/u-boot"
-
-source "target/device/Config.in.u-boot"
-
-config BR2_TARGET_UBOOT_CUSTOM_PATCH
-	string "custom patch"
-	help
-	  If your board requires a custom patch, add the path to the file here.
-	  Most users may leave this empty
-
-choice
-	prompt "Bootsource"
-	depends on BR2_BOOTSOURCE
-	default BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD
-	bool "Boot from dataflashcard"
-	depends on BR2_BOOTSOURCE_DATAFLASHCARD
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	bool "Boot from dataflash"
-	depends on BR2_BOOTSOURCE_DATAFLASH
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH
-	bool "Boot from a NAND flash"
-	depends on BR2_BOOTSOURCE_NANDFLASH
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_FLASH
-	bool "Boot from a parallell flash"
-	depends on BR2_BOOTSOURCE_FLASH
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD
-	bool "Boot from an SD-Card"
-	depends on BR2_BOOTSOURCE_SDCARD
-
-	config BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM
-	bool "Boot from a serial EEPROM (Not yet supported)"
-	depends on BR2_BOOTSOURCE_EEPROM
-
-endchoice
-
-config BR2_TARGET_UBOOT_BOOTSOURCE
-	string
-	depends on BR2_BOOTSOURCE
-	default "dataflash"	if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD
-	default "dataflash"	if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default "nandflash"	if BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH
-	default "flash"		if BR2_TARGET_UBOOT_BOOTSOURCE_FLASH
-	default "sdcard"	if BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD
-	default "eeprom"	if BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM
-
-config BR2_TARGET_UBOOT_SILENT
-	bool "silent console"
-	help
-	  If the option has been enabled, the output can be
-	  silenced by setting the environment variable "silent".
-
-config BR2_TARGET_UBOOT_TOOL_MKIMAGE
-	bool "mkimage tool in target"
-	help
-	  Install mkimage tool in target.
-
-config BR2_TARGET_UBOOT_TOOL_ENV
-	bool "fw_printenv tool in target"
-	help
-	  Install fw_printenv / fw_setenv tools in target.
-
-menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV
-	bool "Generate a default environment"
-	help
-	  Will generate variables for factory default command
-	  and autoscript.
-
-if BR2_TARGET_UBOOT_DEFAULT_ENV
-choice
-	prompt "SDRAM Memory size"
-	default BR2_TARGET_UBOOT_SDRAM_SIZE_64M
-	help
-	  Size of the onboard SDRAM
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_256MB
-	bool "256 MB"
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_128MB
-	bool "128 MB"
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_64MB
-	bool "64 MB"
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_32MB
-	bool "32 MB"
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_16MB
-	bool "16 MB"
-
-config BR2_TARGET_UBOOT_SDRAM_SIZE_8MB
-	bool "8 MB"
-
-endchoice
-
-config BR2_TARGET_UBOOT_MEMORY_SIZE
-	string
-	default "256M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_256MB
-	default "128M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_128MB
-	default "64M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_64MB
-	default "32M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_32MB
-	default "16M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_16MB
-	default "8M"	if BR2_TARGET_UBOOT_SDRAM_SIZE_8MB
-
-choice
-	prompt "Kernel Size"
-	default BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
-	bool "Kernel size is less than 1.25 MB"
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
-	bool "Kernel size is less than 1.50 MB"
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
-	bool "Kernel size is less than 1.75 MB"
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
-	bool "Kernel size is less than 2.00 MB"
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
-	bool "Kernel size is less than 2.25 MB"
-
-config BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
-	bool "Kernel size is less than 2.50 MB"
-
-endchoice
-
-choice
-	prompt "Dataflash Size"
-	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default BR2_TARGET_UBOOT_DATAFLASH_SIZE_2_00MB
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB
-	bool "Dataflash size is 8 MB"
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB
-	bool "Dataflash size is 4 MB"
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB
-	bool "Dataflash size is 2 MB"
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_1MB
-	bool "Dataflash size is 1 MB"
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB
-	bool "Dataflash size is 0.5 MB"
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB
-	bool "Dataflash size is 0.25 MB"
-
-endchoice
-
-config BR2_TARGET_UBOOT_DATAFLASH_SIZE
-	string
-	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default "8M"	if BR2_TARGET_DATAFLASH_SIZE_8MB
-	default "4M"	if BR2_TARGET_DATAFLASH_SIZE_4MB
-	default "2M"	if BR2_TARGET_DATAFLASH_SIZE_2MB
-	default "1M"	if BR2_TARGET_DATAFLASH_SIZE_1MB
-	default "0.5M"	if BR2_TARGET_DATAFLASH_SIZE_0_50MB
-	default "0.25M"	if BR2_TARGET_DATAFLASH_SIZE_0_25MB
-
-config BR2_TARGET_UBOOT_END_OF_FLASH
-	string
-	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default "C083FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB
-	default "C041FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB
-	default "C020FFFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB
-	default "C0107FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_1MB
-	default "C0083FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB
-	default "C0041FFF" if  BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB
-	help
-
-config BR2_TARGET_UBOOT_KERNEL_START
-	string "Kernel SDRAM address"
-	default "21000000"
-	help
-	  Kernel is loaded to this address in SDRAM
-
-config BR2_TARGET_UBOOT_KERNEL_LOCATION
-	string "Kernel flash address"
-	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || \
-			BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default "C0042000" if BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default ""
-	help
-	  Kernel location in dataflash
-
-config BR2_TARGET_UBOOT_FILESYSTEM_START
-	string
-	default "2114A000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
-	default "2118C000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
-  	default "211CE000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
-  	default "21210000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
-  	default "21252000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
-  	default "21294000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
-	help
-	  Kernel is loaded to this SDRAM address
-	  Assumes SDRAM starts at 20000000
-	  Will need to be updated if the SDRAM is located elsewhere
-
-config BR2_TARGET_UBOOT_FILESYSTEM_LOCATION
-	string
-	depends on BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD || \
-			BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH
-	default "C018C000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB
-  	default "C01CE000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB
-  	default "C0210000" if BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB
-  	default "C0252000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB
-  	default "C0294000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB
-  	default "C02D6000" if BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB
-	help
-	  Determine location for File System in Dataflash
-	  This needs to be updated for other memory technologies
-
-config BR2_TARGET_UBOOT_FILESYSTEM_SIZE
-	string "File System Size"
-	default "6000000"
-	help
-
-menuconfig BR2_TARGET_UBOOT_NETWORK
-	bool "Network Settings"
-	default y
-	help
-	  Network settings for U-boot
-
-if BR2_TARGET_UBOOT_NETWORK
-
-config BR2_TARGET_UBOOT_SERVERIP
-	string "server ip"
-	default "10.175.196.221"
-	help
-	  TFTP server ip address
-
-config BR2_TARGET_UBOOT_IPADDR
-	string "ip address"
-	default "10.175.196.18"
-	help
-	  Target ip address
-
-config BR2_TARGET_UBOOT_GATEWAY
-	string "gateway ip"
-	default "10.175.196.1"
-	help
-	  Gateway ip address
-
-config BR2_TARGET_UBOOT_NETMASK
-	string "netmask"
-	default "255.255.255.0"
-	help
-	  Network Mask
-
-config BR2_TARGET_UBOOT_ETHADDR
-	string "ethernet address"
-	default "04:25:fe:ed:00:18"
-	help
-	  Target MAC address for the ethernet interface.
-	  This should be changed for production units
-
-config BR2_TARGET_UBOOT_ETH1ADDR
-	string "ethernet 2 address"
-	help
-	  Target MAC address for the second ethernet interface.
-
-endif # BR2_TARGET_UBOOT_NETWORK
-
-endif # BR2_TARGET_UBOOT_DEFAULT_ENV
-
-endif # BR2_TARGET_UBOOT
-
-config BR2_BOOTSOURCE_DATAFLASHCARD
-	bool
-	help
-	  Allow use of a dataflashcard as a boot source
-
-config BR2_BOOTSOURCE_DATAFLASH
-	bool
-	help
-	  Allow use of a dataflash as a boot source
-
-config BR2_BOOTSOURCE_NANDFLASH
-	bool
-	help
-	  Allow use of a NAND flash as a boot source
-
-config BR2_BOOTSOURCE_FLASH
-	bool
-	help
-	  Allow use of a flash RAM as a boot source
-
-config BR2_BOOTSOURCE_SDCARD
-	bool
-	help
-	  Allow use of an SD-card as a boot source
-
-config BR2_BOOTSOURCE_EEPROM
-	bool
-	help
-	  Allow use of a serial eeprom as a boot source
-
-config	BR2_BOOTSOURCE
-	bool
-	default y if BR2_BOOTSOURCE_DATAFLASHCARD
-	default y if BR2_BOOTSOURCE_DATAFLASH
-	default y if BR2_BOOTSOURCE_NANDFLASH
-	default y if BR2_BOOTSOURCE_FLASH
-	default y if BR2_BOOTSOURCE_SDCARD
-	default y if BR2_BOOTSOURCE_EEPROM
diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in
deleted file mode 100644
index d1bb5e531..000000000
--- a/target/u-boot/Makefile.in
+++ /dev/null
@@ -1,293 +0,0 @@
-#############################################################
-#
-# U-Boot
-#
-#############################################################
-U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION))
-
-U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2
-
-U_BOOT_SITE:=$(call qstrip,$(BR2_U_BOOT_SITE))
-U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
-U_BOOT_PATCH_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches
-U_BOOT_CAT:=$(BZCAT)
-U_BOOT_BIN:=u-boot.bin
-U_BOOT_TARGET_BIN:=u-boot-$(U_BOOT_VERSION)-$(DATE).bin
-
-U_BOOT_TOOLS:=$(HOST_DIR)/usr/bin/mkimage
-MKIMAGE:=$(U_BOOT_TOOLS)
-U_BOOT_AUTOSCRIPT=$(BINARIES_DIR)/autoscript
-
-U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS)
-
-ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_DEFAULT_ENV)),y)
-U_BOOT_TARGETS += u-boot-autoscript
-endif
-
-TARGET_UBOOT_IPADDR:=$(call qstrip,$(BR2_TARGET_UBOOT_IPADDR))
-TARGET_UBOOT_SERVERIP:=$(call qstrip,$(BR2_TARGET_UBOOT_SERVERIP))
-TARGET_UBOOT_GATEWAY:=$(call qstrip,$(BR2_TARGET_UBOOT_GATEWAY))
-TARGET_UBOOT_NETMASK:=$(call qstrip,$(BR2_TARGET_UBOOT_NETMASK))
-TARGET_UBOOT_ETHADDR:=$(call qstrip,$(BR2_TARGET_UBOOT_ETHADDR))
-
-# u-boot still uses arch=ppc for powerpc
-U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
-ifeq ($(UBOOT_BOARD_NAME),)
-UBOOT_BOARD_NAME:=$(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
-endif
-
-U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h
-
-U_BOOT_TARGET_TOOLS:=
-ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y)
-U_BOOT_TARGETS+=$(TARGET_DIR)/usr/bin/mkimage
-endif
-ifeq ($(BR2_TARGET_UBOOT_TOOL_ENV),y)
-U_BOOT_TARGETS+=$(TARGET_DIR)/usr/sbin/fw_printenv
-endif
-
-U_BOOT_CONFIGURE_OPTS :=
-
-ifneq ($(BR2_TARGET_UBOOT_1_2_0_ATMEL),)
-U_BOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
-endif
-
-# Define a helper function
-define insert_define
-@echo "#ifdef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
-@echo "#undef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE)
-@echo "#endif" >> $(U_BOOT_INC_CONF_FILE)
-@echo '#define $(strip $(1)) $(call qstrip,$(2))' >> $(U_BOOT_INC_CONF_FILE)
-endef
-
-$(DL_DIR)/$(U_BOOT_SOURCE):
-	 $(call DOWNLOAD,$(U_BOOT_SITE),$(U_BOOT_SOURCE))
-
-$(U_BOOT_DIR)/.unpacked: $(DL_DIR)/$(U_BOOT_SOURCE)
-	$(U_BOOT_CAT) $(DL_DIR)/$(U_BOOT_SOURCE) \
-		| tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	mkdir -p $(U_BOOT_DIR)
-	touch $@
-
-$(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
-	toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot \
-		u-boot-$(U_BOOT_VERSION)-\*.patch \
-		u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
-ifneq ($(strip $(U_BOOT_ARCH_PATCH_DIR)),)
-	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_ARCH_PATCH_DIR) \*.patch
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_CUSTOM_PATCH)),"")
-	@mkdir -p $(U_BOOT_PATCH_DIR)
-	cp -dpr $(BR2_TARGET_UBOOT_CUSTOM_PATCH) $(U_BOOT_PATCH_DIR)
-	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_PATCH_DIR) \*.patch
-endif
-	touch $@
-
-$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched
-	$(TARGET_CONFIGURE_OPTS)		\
-		CFLAGS="$(TARGET_CFLAGS)"	\
-		LDFLAGS="$(TARGET_LDFLAGS)"	\
-		$(U_BOOT_CONFIGURE_OPTS) \
-		$(MAKE) -C $(U_BOOT_DIR)	\
-		$(UBOOT_BOARD_NAME)_config
-	touch $@
-
-$(U_BOOT_DIR)/.header_modified: $(U_BOOT_DIR)/.configured
-	# Modify configuration header in $(U_BOOT_INC_CONF_FILE)
-ifdef BR2_TARGET_UBOOT_DEFAULT_ENV
-	@echo >> $(U_BOOT_INC_CONF_FILE)
-	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(U_BOOT_INC_CONF_FILE)
-	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
-	@echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
-	$(call insert_define, DATE, $(DATE))
-	$(call insert_define, CONFIG_LOAD_SCRIPTS, 1)
-endif # BR2_TARGET_UBOOT_DEFAULT_ENV
-ifdef BR2_TARGET_UBOOT_NETWORK
-ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"")
-	$(call insert_define, CONFIG_IPADDR, $(BR2_TARGET_UBOOT_IPADDR))
-ifneq ($(strip $(BR2_TARGET_UBOOT_GATEWAY)),"")
-	$(call insert_define, CONFIG_GATEWAYIP, $(BR2_TARGET_UBOOT_GATEWAY))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_NETMASK)),"")
-	$(call insert_define, CONFIG_NETMASK, $(BR2_TARGET_UBOOT_NETMASK))
-endif
-endif # end BR2_TARGET_U_BOOT_IPADDR
-ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"")
-	$(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_ETHADDR)),"")
-	$(call insert_define, CONFIG_ETHADDR, $(BR2_TARGET_UBOOT_ETHADDR))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),)
-ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),"")
-	$(call insert_define, CONFIG_ETH1ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))
-endif
-endif
-endif # BR2_TARGET_UBOOT_NETWORK
-ifeq ($(BR2_TARGET_UBOOT_SILENT),y)
-	$(call insert_define, CONFIG_SILENT_CONSOLE,)
-endif
-ifdef BR2_TARGET_UBOOT_DEFAULT_ENV
-ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_START)),"")
-	$(call insert_define, KERNEL_START, $(BR2_TARGET_UBOOT_KERNEL_START))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_LOCATION)),"")
-	$(call insert_define, KERNEL_LOCATION, $(BR2_TARGET_UBOOT_KERNEL_LOCATION))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_START)),"")
-	$(call insert_define, FILESYSTEM_START, $(BR2_TARGET_UBOOT_FILESYSTEM_START))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_LOCATION)),"")
-	$(call insert_define, FILESYSTEM_LOCATION, $(BR2_TARGET_UBOOT_FILESYSTEM_LOCATION))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_FILESYSTEM_SIZE)),"")
-	$(call insert_define, FILESYSTEM_SIZE, $(BR2_TARGET_UBOOT_FILESYSTEM_SIZE))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_END_OF_FLASH)),"")
-	$(call insert_define, END_OF_FLASH, $(BR2_TARGET_UBOOT_END_OF_FLASH))
-endif
-ifneq ($(strip $(BR2_TARGET_UBOOT_MEMORY_SIZE)),"")
-	$(call insert_define, MEMORY_SIZE, $(BR2_TARGET_UBOOT_MEMORY_SIZE))
-endif
-	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
-endif # BR2_TARGET_UBOOT_DEFAULT_ENV
-	touch $@
-
-$(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified
-	$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		$(U_BOOT_CONFIGURE_OPTS) \
-		$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \
-		 -C $(U_BOOT_DIR)
-
-$(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
-	rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)
-	rm -f $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
-	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
-	(cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET_BIN) $(U_BOOT_BIN))
-
-$(U_BOOT_TOOLS): $(U_BOOT_DIR)/$(U_BOOT_BIN)
-	mkdir -p $(@D)
-	cp -dpf $(U_BOOT_DIR)/tools/mkimage $@
-
-$(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/$(U_BOOT_BIN)
-	mkdir -p $(@D)
-	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \
-		-DUSE_HOSTCC -o $@ \
-		$(U_BOOT_DIR)/common/image.c \
-		$(wildcard $(addprefix $(U_BOOT_DIR)/tools/,default_image.c \
-			fit_image.c imximage.c kwbimage.c mkimage.c)) \
-		$(addprefix $(U_BOOT_DIR)/lib_generic/,crc32.c md5.c sha1.c) \
-		$(U_BOOT_DIR)/tools/os_support.c \
-		$(U_BOOT_DIR)/libfdt/fdt*.c
-
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-
-$(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/$(U_BOOT_BIN)
-	mkdir -p $(@D)
-	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(LINUX_HEADERS_DIR)/include \
-		-DUSE_HOSTCC -o $@ \
-		$(U_BOOT_DIR)/tools/env/*.c $(U_BOOT_DIR)/lib_generic/crc32.c
-	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-	ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv
-
-u-boot: $(U_BOOT_TARGETS)
-
-u-boot-autoscript: $(U_BOOT_AUTOSCRIPT).img
-
-u-boot-clean:
-	-$(MAKE) -C $(U_BOOT_DIR) clean
-	rm -f $(U_BOOT_TOOLS) $(U_BOOT_TARGET_TOOLS)
-
-u-boot-dirclean:
-	rm -rf $(U_BOOT_DIR)
-
-u-boot-source: $(DL_DIR)/$(U_BOOT_SOURCE)
-
-u-boot-unpacked: $(U_BOOT_DIR)/.patched
-
-u-boot-configured: $(U_BOOT_DIR)/.header_modified
-
-#############################################################
-#
-# Generate an autoscript with the configration items
-#
-#############################################################
-
-$(U_BOOT_AUTOSCRIPT): .config
-	rm -f $(U_BOOT_AUTOSCRIPT)
-ifneq ($(TARGET_UBOOT_IPADDR),)
-	echo setenv ipaddr $(TARGET_UBOOT_IPADDR) > $(U_BOOT_AUTOSCRIPT)
-else
-	echo TARGET_UBOOT_IPADDR="$(TARGET_UBOOT_IPADDR)"
-endif
-ifneq ($(TARGET_UBOOT_SERVERIP),)
-	echo setenv serverip $(TARGET_UBOOT_SERVERIP) >> $(U_BOOT_AUTOSCRIPT)
-endif
-ifneq ($(TARGET_UBOOT_GATEWAY),)
-	echo setenv gatewayip $(TARGET_UBOOT_GATEWAY) >> $(U_BOOT_AUTOSCRIPT)
-endif
-ifneq ($(TARGET_UBOOT_NETMASK),)
-	echo setenv netmask $(TARGET_UBOOT_NETMASK) >> $(U_BOOT_AUTOSCRIPT)
-endif
-	echo setenv linux $(LINUX26_KERNEL_NAME) >> $(U_BOOT_AUTOSCRIPT)
-	echo setenv kernel-version $(LINUX26_VERSION) >> $(U_BOOT_AUTOSCRIPT)
-	echo setenv kernel-date $(DATE) >> $(U_BOOT_AUTOSCRIPT)
-	echo setenv hostname $(TARGET_HOSTNAME) >> $(U_BOOT_AUTOSCRIPT)
-	echo setenv fs-date $(DATE) >> $(U_BOOT_AUTOSCRIPT)
-	echo setenv rd-1 rootfs.$(ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT)
-	echo setenv rd-2 rootfs.$(ARCH)-$(DATE).jffs2 >> $(U_BOOT_AUTOSCRIPT)
-	echo setenv rd rootfs.$(BR2_ARCH)-$(DATE).ext2 >> $(U_BOOT_AUTOSCRIPT)
-	echo setenv ver 1 >> $(U_BOOT_AUTOSCRIPT)
-ifneq ($(TARGET_UBOOT_ETHADDR),)
-	echo setenv ethaddr $(TARGET_UBOOT_ETHADDR) >> $(U_BOOT_AUTOSCRIPT)
-endif
-	echo setenv fstype ram >> $(U_BOOT_AUTOSCRIPT)
-	echo fs >> $(U_BOOT_AUTOSCRIPT)
-	echo os >> $(U_BOOT_AUTOSCRIPT)
-	echo setargs >> $(U_BOOT_AUTOSCRIPT)
-	echo saveenv >> $(U_BOOT_AUTOSCRIPT)
-
-$(U_BOOT_AUTOSCRIPT).img: $(U_BOOT_AUTOSCRIPT) $(MKIMAGE)
-	$(MKIMAGE) -A $(ARCH) \
-				-O linux \
-				-T script \
-				-C none \
-				-a 0 \
-				-e 0 \
-				-n "autoscr config" \
-				-d $(U_BOOT_AUTOSCRIPT) \
-				$(U_BOOT_AUTOSCRIPT).img
-
-
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_UBOOT),y)
-TARGETS+=u-boot
-
-# we NEED a board name
-ifeq ($(UBOOT_BOARD_NAME),)
-$(error NO U-Boot board name set. Check your BR2_TARGET_UBOOT_BOARDNAME setting)
-endif
-
-endif
-
-u-boot-status:
-	@echo
-	@echo U_BOOT_INC_CONF_FILE = $(U_BOOT_INC_CONF_FILE)
-	@echo BR2_UBOOT_VERSION = $(BR2_UBOOT_VERSION)
-	@echo BR2_TARGET_UBOOT_SERVERIP = $(BR2_TARGET_UBOOT_SERVERIP)
-	@echo BR2_TARGET_UBOOT_IPADDR = $(BR2_TARGET_UBOOT_IPADDR)
-	@echo BR2_TARGET_UBOOT_GATEWAY = $(BR2_TARGET_UBOOT_GATEWAY)
-	@echo BR2_TARGET_UBOOT_NETMASK = $(BR2_TARGET_UBOOT_NETMASK)
-	@echo BR2_TARGET_UBOOT_ETH0ADDR = $(BR2_TARGET_UBOOT_ETHADDR)
-	@echo BR2_TARGET_UBOOT_ETH1ADDR = $(BR2_TARGET_UBOOT_ETH1ADDR)
-	@echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
-	@echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)
-	@exit 0
-
diff --git a/target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 b/target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32
deleted file mode 100644
index 07cddb000..000000000
--- a/target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN u-boot-2009.01-rc3/include/asm-avr32/io.h u-boot-avr32//include/asm-avr32/io.h
---- u-boot-2009.01-rc3/include/asm-avr32/io.h	2009-01-18 21:37:48.000000000 +0100
-+++ u-boot-avr32//include/asm-avr32/io.h	2009-01-22 07:14:38.000000000 +0100
-@@ -125,9 +125,4 @@
- 
- }
- 
--static inline phys_addr_t virt_to_phys(void * vaddr)
--{
--	return (phys_addr_t)(vaddr);
--}
--
- #endif /* __ASM_AVR32_IO_H */
diff --git a/target/x86/Makefile.in b/target/x86/Makefile.in
deleted file mode 100644
index 115035cbb..000000000
--- a/target/x86/Makefile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-ifeq ($(BR2_i386),y)
-include target/x86/*/*.mk
-endif
diff --git a/target/x86/grub/Config.in b/target/x86/grub/Config.in
deleted file mode 100644
index bc7a73e73..000000000
--- a/target/x86/grub/Config.in
+++ /dev/null
@@ -1,146 +0,0 @@
-config BR2_TARGET_GRUB
-	bool "grub"
-	depends on BR2_i386 || BR2_x86_64
-	help
-	  The GRand Unified Bootloader for x86 systems.
-
-config BR2_TARGET_GRUB_SPLASH
-	bool "Splashimage support"
-	depends on BR2_TARGET_GRUB
-	help
-	  Add support for splashimage.
-	
-	  A splashimage is a 14-color indexed .xpm picture which
-	  is displayed as background for the grub menu.
-
-config BR2_TARGET_GRUB_DISKLESS
-	bool "diskless support"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable diskless support
-
-config BR2_TARGET_GRUB_3c595
-	bool "3Com595 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable 3Com595 driver
-
-config BR2_TARGET_GRUB_3c90x
-	bool "3Com90x driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable 3Com90x driver
-
-config BR2_TARGET_GRUB_davicom
-	bool "Davicom driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Davicom driver
-
-config BR2_TARGET_GRUB_e1000
-	bool "Etherexpress Pro/1000 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Etherexpress Pro/1000 driver
-
-config BR2_TARGET_GRUB_eepro100
-	bool "Etherexpress Pro/100 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Etherexpress Pro/100 driver
-
-config BR2_TARGET_GRUB_epic100
-	bool "SMC 83c170 EPIC/100 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable SMC 83c170 EPIC/100 driver
-
-config BR2_TARGET_GRUB_forcedeth
-	bool "Nvidia Geforce driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Nvidia Geforce driver
-
-config BR2_TARGET_GRUB_natsemi
-	bool "NatSemi DP8381x driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable NatSemi DP8381x driver
-
-config BR2_TARGET_GRUB_ns83820
-	bool "NS83820 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable NS83820 driver
-
-config BR2_TARGET_GRUB_ns8390
-	bool "NE2000 PCI driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable NE2000 PCI driver
-
-config BR2_TARGET_GRUB_pcnet32
-	bool "AMD Lance/PCI PCNet/32 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable AMD Lance/PCI PCNet/32 driver
-
-config BR2_TARGET_GRUB_pnic
-	bool "Bochs Pseudo Nic driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Bochs Pseudo Nic driver
-
-config BR2_TARGET_GRUB_rtl8139
-	bool "Realtek 8139 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Realtek 8139 driver
-
-config BR2_TARGET_GRUB_r8169
-	bool "Realtek 8169 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Realtek 8169 driver
-
-config BR2_TARGET_GRUB_sis900
-	bool "SIS 900 and SIS 7016 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable SIS 900 and SIS 7016 driver
-
-config BR2_TARGET_GRUB_tg3
-	bool "Broadcom Tigon3 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Broadcom Tigon3 driver
-
-config BR2_TARGET_GRUB_tulip
-	bool "Tulip driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Tulip driver
-
-config BR2_TARGET_GRUB_tlan
-	bool "TI ThunderLAN driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable TI ThunderLAN driver
-
-config BR2_TARGET_GRUB_undi
-	bool "PXE UNDI driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable PXE UNDI driver
-
-config BR2_TARGET_GRUB_via_rhine
-	bool "Rhine-I/II driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Rhine-I/II driver
-
-config BR2_TARGET_GRUB_w89c840
-	bool "Winbond W89c840 driver"
-	depends on BR2_TARGET_GRUB
-	help
-	  enable Winbond W89c840 driver
diff --git a/target/x86/grub/grub.100-autoreconf.patch b/target/x86/grub/grub.100-autoreconf.patch
deleted file mode 100644
index e5dd8343a..000000000
--- a/target/x86/grub/grub.100-autoreconf.patch
+++ /dev/null
@@ -1,1407 +0,0 @@
-diff -rup grub-0.97.oorig/aclocal.m4 grub-0.97/aclocal.m4
---- grub-0.97.oorig/aclocal.m4	2005-05-08 04:41:18.000000000 +0200
-+++ grub-0.97/aclocal.m4	2006-03-12 14:00:35.000000000 +0100
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,23 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--#                                                        -*- Autoconf -*-
--# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
-@@ -40,26 +28,15 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.4])])
--
--# AM_AUX_DIR_EXPAND
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-@@ -106,26 +83,16 @@ AC_PREREQ([2.50])dnl
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
- 
--# AM_CONDITIONAL                                              -*- Autoconf -*-
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 6
-+# serial 7
- 
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -149,26 +116,15 @@ AC_CONFIG_COMMANDS_PRE(
- Usually this means the macro was only invoked conditionally.]])
- fi])])
- 
--# serial 7						-*- Autoconf -*-
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+# serial 8
- 
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -177,7 +133,6 @@ fi])])
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -317,27 +272,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_
- AC_SUBST([AMDEPBACKSLASH])
- ])
- 
--# Generate code to set up dependency tracking.   -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--#   Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--#serial 2
-+#serial 3
- 
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -396,30 +340,19 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
-      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
- 
--# Do all the work for Automake.                            -*- Autoconf -*-
-+# Do all the work for Automake.                             -*- Autoconf -*-
- 
--# This macro actually does too much some checks are only needed if
--# your package does certain things.  But this isn't really a big deal.
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# serial 12
- 
--# serial 11
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
- 
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -521,51 +454,27 @@ for _am_header in $config_headers :; do
- done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
- 
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_INSTALL_SH
- # ------------------
- # Define $install_sh.
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
- 
--#                                                          -*- Autoconf -*-
--# Copyright (C) 2003  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 1
-+# serial 2
- 
- # Check whether the underlying file-system supports filenames
- # with a leading dot.  For instance MS-DOS doesn't.
-@@ -580,28 +489,17 @@ fi
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
- 
--# Add --enable-maintainer-mode option to configure.
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
- # From Jim Meyering
- 
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 3
-+# serial 4
- 
- AC_DEFUN([AM_MAINTAINER_MODE],
- [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-@@ -620,26 +518,15 @@ AC_DEFUN([AM_MAINTAINER_MODE],
- 
- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- 
--# Check to see how 'make' treats includes.	-*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 2
-+# serial 3
- 
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -683,27 +570,16 @@ AC_MSG_RESULT([$_am_result])
- rm -f confinc confmf
- ])
- 
--#  -*- Autoconf -*-
--
--
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 3
-+# serial 4
- 
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -729,27 +605,16 @@ else
- fi
- ])
- 
-+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_MKDIR_P
- # ---------------
- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+#
- # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
- # created by `make install' are always world readable, even if the
- # installer happens to have an overly restrictive umask (e.g. 077).
-@@ -803,26 +668,15 @@ else
- fi
- AC_SUBST([mkdir_p])])
- 
--# Helper functions for option handling.                    -*- Autoconf -*-
-+# Helper functions for option handling.                     -*- Autoconf -*-
- 
--# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 2
-+# serial 3
- 
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -847,28 +701,16 @@ AC_DEFUN([_AM_SET_OPTIONS],
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 3
-+# serial 4
- 
- # AM_SANITY_CHECK
- # ---------------
-@@ -911,25 +753,14 @@ Check your system clock])
- fi
- AC_MSG_RESULT(yes)])
- 
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries.  This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -952,25 +783,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
- # Check how to create a tarball.                            -*- Autoconf -*-
- 
--# Copyright (C) 2004  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 1
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# serial 2
- 
- # _AM_PROG_TAR(FORMAT)
- # --------------------
-Only in grub-0.97/: autom4te.cache
-diff -rup grub-0.97.oorig/configure grub-0.97/configure
---- grub-0.97.oorig/configure	2005-05-08 04:48:12.000000000 +0200
-+++ grub-0.97/configure	2006-03-12 14:00:38.000000000 +0100
-@@ -311,7 +311,7 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PERL CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS RANLIB ac_ct_RANLIB STAGE1_CFLAGS STAGE2_CFLAGS GRUB_CFLAGS OBJCOPY ac_ct_OBJCOPY GRUB_LIBS CPP EGREP NETBOOT_SUPPORT_TRUE NETBOOT_SUPPORT_FALSE DISKLESS_SUPPORT_TRUE DISKLESS_SUPPORT_FALSE HERCULES_SUPPORT_TRUE HERCULES_SUPPORT_FALSE SERIAL_SUPPORT_TRUE SERIAL_SUPPORT_FALSE SERIAL_SPEED_SIMULATION_TRUE SERIAL_SPEED_SIMULATION_FALSE BUILD_EXAMPLE_KERNEL_TRUE BUILD_EXAMPLE_KERNEL_FALSE FSYS_CFLAGS NET_CFLAGS NET_EXTRAFLAGS NETBOOT_DRIVERS CCASFLAGS LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PERL CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS RANLIB ac_ct_RANLIB STAGE1_CFLAGS STAGE2_CFLAGS GRUB_CFLAGS OBJCOPY ac_ct_OBJCOPY GRUB_LIBS CPP EGREP NETBOOT_SUPPORT_TRUE NETBOOT_SUPPORT_FALSE DISKLESS_SUPPORT_TRUE DISKLESS_SUPPORT_FALSE GRAPHICS_SUPPORT_TRUE GRAPHICS_SUPPORT_FALSE HERCULES_SUPPORT_TRUE HERCULES_SUPPORT_FALSE SERIAL_SUPPORT_TRUE SERIAL_SUPPORT_FALSE SERIAL_SPEED_SIMULATION_TRUE SERIAL_SPEED_SIMULATION_FALSE BUILD_EXAMPLE_KERNEL_TRUE BUILD_EXAMPLE_KERNEL_FALSE FSYS_CFLAGS NET_CFLAGS NET_EXTRAFLAGS NETBOOT_DRIVERS CCASFLAGS LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -914,6 +914,7 @@ Optional Features:
-                           set the default memory location for WD/SMC
-   --enable-cs-scan=LIST   probe for CS89x0 base address using LIST
-   --enable-diskless       enable diskless support
-+  --disable-graphics      disable graphics terminal support
-   --disable-hercules      disable hercules terminal support
-   --disable-serial        disable serial terminal support
-   --enable-serial-speed-simulation
-@@ -1032,7 +1033,7 @@ esac
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd $ac_popdir
-+    cd "$ac_popdir"
-   done
- fi
- 
-@@ -2631,8 +2632,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2690,8 +2690,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2807,8 +2806,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2862,8 +2860,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2908,8 +2905,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2953,8 +2949,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3458,8 +3453,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3523,8 +3517,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3595,8 +3588,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3656,8 +3648,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4095,8 +4086,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4161,8 +4151,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4234,8 +4223,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4300,8 +4288,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4366,8 +4353,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4440,8 +4426,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4506,8 +4491,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4597,8 +4581,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4673,8 +4656,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4745,8 +4727,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5070,8 +5051,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5241,8 +5221,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5313,8 +5292,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5966,6 +5944,22 @@ else
- fi
- 
- 
-+# Check whether --enable-graphics or --disable-graphics was given.
-+if test "${enable_graphics+set}" = set; then
-+  enableval="$enable_graphics"
-+
-+fi;
-+
-+
-+if test "x$enable_graphics" != xno; then
-+  GRAPHICS_SUPPORT_TRUE=
-+  GRAPHICS_SUPPORT_FALSE='#'
-+else
-+  GRAPHICS_SUPPORT_TRUE='#'
-+  GRAPHICS_SUPPORT_FALSE=
-+fi
-+
-+
- # Check whether --enable-hercules or --disable-hercules was given.
- if test "${enable_hercules+set}" = set; then
-   enableval="$enable_hercules"
-@@ -6270,6 +6264,13 @@ echo "$as_me: error: conditional \"DISKL
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+if test -z "${GRAPHICS_SUPPORT_TRUE}" && test -z "${GRAPHICS_SUPPORT_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"GRAPHICS_SUPPORT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"GRAPHICS_SUPPORT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- if test -z "${HERCULES_SUPPORT_TRUE}" && test -z "${HERCULES_SUPPORT_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"HERCULES_SUPPORT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -6907,6 +6908,8 @@ s,@NETBOOT_SUPPORT_TRUE@,$NETBOOT_SUPPOR
- s,@NETBOOT_SUPPORT_FALSE@,$NETBOOT_SUPPORT_FALSE,;t t
- s,@DISKLESS_SUPPORT_TRUE@,$DISKLESS_SUPPORT_TRUE,;t t
- s,@DISKLESS_SUPPORT_FALSE@,$DISKLESS_SUPPORT_FALSE,;t t
-+s,@GRAPHICS_SUPPORT_TRUE@,$GRAPHICS_SUPPORT_TRUE,;t t
-+s,@GRAPHICS_SUPPORT_FALSE@,$GRAPHICS_SUPPORT_FALSE,;t t
- s,@HERCULES_SUPPORT_TRUE@,$HERCULES_SUPPORT_TRUE,;t t
- s,@HERCULES_SUPPORT_FALSE@,$HERCULES_SUPPORT_FALSE,;t t
- s,@SERIAL_SUPPORT_TRUE@,$SERIAL_SUPPORT_TRUE,;t t
-@@ -7088,11 +7091,6 @@ esac
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -7131,6 +7129,12 @@ echo "$as_me: error: cannot find input f
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-+
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
-diff -rup grub-0.97.oorig/docs/Makefile.in grub-0.97/docs/Makefile.in
---- grub-0.97.oorig/docs/Makefile.in	2005-05-08 04:42:34.000000000 +0200
-+++ grub-0.97/docs/Makefile.in	2006-03-12 14:00:43.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,8 +15,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kernel_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -120,6 +118,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-@@ -304,9 +304,11 @@ kernel-kernel.obj: kernel.c
- 	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
- 	am__cwd=`pwd` && cd $(srcdir) && \
- 	rm -rf $$backupdir && mkdir $$backupdir && \
--	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
--	  if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
--	done; \
-+	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
-+	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-+	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
-+	  done; \
-+	else :; fi && \
- 	cd "$$am__cwd"; \
- 	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
- 	 -o $@ $<; \
-@@ -371,10 +373,11 @@ multiboot.dvi: multiboot.texi $(multiboo
- multiboot.pdf: multiboot.texi $(multiboot_TEXINFOS)
- multiboot.html: multiboot.texi $(multiboot_TEXINFOS)
- .dvi.ps:
-+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	$(DVIPS) -o $@ $<
- 
- uninstall-info-am:
--	$(PRE_UNINSTALL)
-+	@$(PRE_UNINSTALL)
- 	@if (install-info --version && \
- 	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
- 	  list='$(INFO_DEPS)'; \
-@@ -390,7 +393,7 @@ uninstall-info-am:
- 	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
- 	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
- 	  (if cd "$(DESTDIR)$(infodir)"; then \
--	     echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
-+	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
- 	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
- 	   else :; fi); \
- 	done
-@@ -403,10 +406,13 @@ dist-info: $(INFO_DEPS)
- 	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
- 	  esac; \
- 	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
--	  for file in $$d/$$base*; do \
--	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
--	    test -f $(distdir)/$$relfile || \
--	      cp -p $$file $(distdir)/$$relfile; \
-+	  base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
-+	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
-+	    if test -f $$file; then \
-+	      relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-+	      test -f $(distdir)/$$relfile || \
-+		cp -p $$file $(distdir)/$$relfile; \
-+	    else :; fi; \
- 	  done; \
- 	done
- 
-diff -rup grub-0.97.oorig/grub/Makefile.in grub-0.97/grub/Makefile.in
---- grub-0.97.oorig/grub/Makefile.in	2005-05-08 04:42:34.000000000 +0200
-+++ grub-0.97/grub/Makefile.in	2006-03-12 14:00:43.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(grub_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -97,6 +95,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-diff -rup grub-0.97.oorig/lib/Makefile.in grub-0.97/lib/Makefile.in
---- grub-0.97.oorig/lib/Makefile.in	2005-05-08 04:42:35.000000000 +0200
-+++ grub-0.97/lib/Makefile.in	2006-03-12 14:00:44.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libcommon_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -96,6 +94,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-diff -rup grub-0.97.oorig/Makefile.in grub-0.97/Makefile.in
---- grub-0.97.oorig/Makefile.in	2005-05-08 04:42:40.000000000 +0200
-+++ grub-0.97/Makefile.in	2006-03-12 14:00:49.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-@@ -250,7 +252,13 @@ uninstall-info-am:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -262,7 +270,7 @@ $(RECURSIVE_TARGETS):
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -270,7 +278,13 @@ $(RECURSIVE_TARGETS):
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -291,7 +305,7 @@ maintainer-clean-recursive:
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -rup grub-0.97.oorig/netboot/Makefile.in grub-0.97/netboot/Makefile.in
---- grub-0.97.oorig/netboot/Makefile.in	2005-05-08 04:42:35.000000000 +0200
-+++ grub-0.97/netboot/Makefile.in	2006-03-12 14:00:44.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libdrivers_a_SOURCES) $(EXTRA_libdrivers_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -97,6 +95,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-diff -rup grub-0.97.oorig/stage1/Makefile.in grub-0.97/stage1/Makefile.in
---- grub-0.97.oorig/stage1/Makefile.in	2005-05-08 04:42:36.000000000 +0200
-+++ grub-0.97/stage1/Makefile.in	2006-03-12 14:00:45.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,8 +15,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(stage1_exec_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -102,6 +100,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-diff -rup grub-0.97.oorig/stage2/Makefile.in grub-0.97/stage2/Makefile.in
---- grub-0.97.oorig/stage2/Makefile.in	2005-05-08 04:42:39.000000000 +0200
-+++ grub-0.97/stage2/Makefile.in	2006-03-12 14:00:48.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,8 +18,6 @@
- 
- 
- 
--SOURCES = $(libgrub_a_SOURCES) $(diskless_exec_SOURCES) $(e2fs_stage1_5_exec_SOURCES) $(fat_stage1_5_exec_SOURCES) $(ffs_stage1_5_exec_SOURCES) $(iso9660_stage1_5_exec_SOURCES) $(jfs_stage1_5_exec_SOURCES) $(minix_stage1_5_exec_SOURCES) $(nbloader_exec_SOURCES) $(pre_stage2_exec_SOURCES) $(pxeloader_exec_SOURCES) $(reiserfs_stage1_5_exec_SOURCES) $(start_exec_SOURCES) $(start_eltorito_exec_SOURCES) $(ufs2_stage1_5_exec_SOURCES) $(vstafs_stage1_5_exec_SOURCES) $(xfs_stage1_5_exec_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -100,7 +98,7 @@ am_libgrub_a_OBJECTS = libgrub_a-boot.$(
- 	libgrub_a-fsys_xfs.$(OBJEXT) libgrub_a-gunzip.$(OBJEXT) \
- 	libgrub_a-md5.$(OBJEXT) libgrub_a-serial.$(OBJEXT) \
- 	libgrub_a-stage2.$(OBJEXT) libgrub_a-terminfo.$(OBJEXT) \
--	libgrub_a-tparm.$(OBJEXT)
-+	libgrub_a-tparm.$(OBJEXT) libgrub_a-graphics.$(OBJEXT)
- libgrub_a_OBJECTS = $(am_libgrub_a_OBJECTS)
- PROGRAMS = $(noinst_PROGRAMS)
- am__objects_1 = diskless_exec-asm.$(OBJEXT) \
-@@ -125,7 +123,8 @@ am__objects_1 = diskless_exec-asm.$(OBJE
- 	diskless_exec-serial.$(OBJEXT) \
- 	diskless_exec-smp-imps.$(OBJEXT) \
- 	diskless_exec-stage2.$(OBJEXT) \
--	diskless_exec-terminfo.$(OBJEXT) diskless_exec-tparm.$(OBJEXT)
-+	diskless_exec-terminfo.$(OBJEXT) diskless_exec-tparm.$(OBJEXT) \
-+	diskless_exec-graphics.$(OBJEXT)
- am_diskless_exec_OBJECTS = $(am__objects_1)
- diskless_exec_OBJECTS = $(am_diskless_exec_OBJECTS)
- diskless_exec_DEPENDENCIES = ../netboot/libdrivers.a
-@@ -217,7 +216,8 @@ am_pre_stage2_exec_OBJECTS = pre_stage2_
- 	pre_stage2_exec-smp-imps.$(OBJEXT) \
- 	pre_stage2_exec-stage2.$(OBJEXT) \
- 	pre_stage2_exec-terminfo.$(OBJEXT) \
--	pre_stage2_exec-tparm.$(OBJEXT)
-+	pre_stage2_exec-tparm.$(OBJEXT) \
-+	pre_stage2_exec-graphics.$(OBJEXT)
- pre_stage2_exec_OBJECTS = $(am_pre_stage2_exec_OBJECTS)
- @NETBOOT_SUPPORT_TRUE@pre_stage2_exec_DEPENDENCIES =  \
- @NETBOOT_SUPPORT_TRUE@	../netboot/libdrivers.a
-@@ -344,6 +344,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-@@ -435,7 +437,7 @@ noinst_HEADERS = apic.h defs.h dir.h dis
-         fat.h filesys.h freebsd.h fs.h hercules.h i386-elf.h \
- 	imgact_aout.h iso9660.h jfs.h mb_header.h mb_info.h md5.h \
- 	nbi.h pc_slice.h serial.h shared.h smp-imps.h term.h \
--	terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h
-+	terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h graphics.h
- 
- EXTRA_DIST = setjmp.S apm.S $(noinst_SCRIPTS)
- 
-@@ -448,7 +450,7 @@ libgrub_a_SOURCES = boot.c builtins.c ch
- 	disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
- 	fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \
- 	fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
--	terminfo.c tparm.c
-+	terminfo.c tparm.c graphics.c
- 
- libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
- 	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
-@@ -479,8 +481,10 @@ START_ELTORITO_LINK = -nostdlib -Wl,-N -
- @SERIAL_SUPPORT_TRUE@SERIAL_FLAGS = -DSUPPORT_SERIAL=1
- @HERCULES_SUPPORT_FALSE@HERCULES_FLAGS = 
- @HERCULES_SUPPORT_TRUE@HERCULES_FLAGS = -DSUPPORT_HERCULES=1
-+@GRAPHICS_SUPPORT_FALSE@GRAPHICS_FLAGS = 
-+@GRAPHICS_SUPPORT_TRUE@GRAPHICS_FLAGS = -DSUPPORT_GRAPHICS=1
- STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
-+	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)
- 
- STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
- STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
-@@ -490,7 +494,8 @@ pre_stage2_exec_SOURCES = asm.S bios.c b
- 	cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \
- 	fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \
- 	fsys_reiserfs.c fsys_ufs2.c fsys_vstafs.c fsys_xfs.c gunzip.c \
--	hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c
-+	hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c \
-+	graphics.c
- 
- pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
- pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
-@@ -766,6 +771,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-fsys_ufs2.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-fsys_vstafs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-fsys_xfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-graphics.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-gunzip.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-hercules.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-md5.Po@am__quote@
-@@ -820,6 +826,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-fsys_ufs2.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-fsys_vstafs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-fsys_xfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-graphics.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-gunzip.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-md5.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-serial.Po@am__quote@
-@@ -850,6 +857,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-fsys_ufs2.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-fsys_vstafs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-fsys_xfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-graphics.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-gunzip.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-hercules.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-md5.Po@am__quote@
-@@ -1367,6 +1375,20 @@ libgrub_a-tparm.obj: tparm.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o libgrub_a-tparm.obj `if test -f 'tparm.c'; then $(CYGPATH_W) 'tparm.c'; else $(CYGPATH_W) '$(srcdir)/tparm.c'; fi`
- 
-+libgrub_a-graphics.o: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -MT libgrub_a-graphics.o -MD -MP -MF "$(DEPDIR)/libgrub_a-graphics.Tpo" -c -o libgrub_a-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgrub_a-graphics.Tpo" "$(DEPDIR)/libgrub_a-graphics.Po"; else rm -f "$(DEPDIR)/libgrub_a-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='libgrub_a-graphics.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o libgrub_a-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
-+
-+libgrub_a-graphics.obj: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -MT libgrub_a-graphics.obj -MD -MP -MF "$(DEPDIR)/libgrub_a-graphics.Tpo" -c -o libgrub_a-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgrub_a-graphics.Tpo" "$(DEPDIR)/libgrub_a-graphics.Po"; else rm -f "$(DEPDIR)/libgrub_a-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='libgrub_a-graphics.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o libgrub_a-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
-+
- diskless_exec-bios.o: bios.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -MT diskless_exec-bios.o -MD -MP -MF "$(DEPDIR)/diskless_exec-bios.Tpo" -c -o diskless_exec-bios.o `test -f 'bios.c' || echo '$(srcdir)/'`bios.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/diskless_exec-bios.Tpo" "$(DEPDIR)/diskless_exec-bios.Po"; else rm -f "$(DEPDIR)/diskless_exec-bios.Tpo"; exit 1; fi
-@@ -1731,6 +1753,20 @@ diskless_exec-tparm.obj: tparm.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -c -o diskless_exec-tparm.obj `if test -f 'tparm.c'; then $(CYGPATH_W) 'tparm.c'; else $(CYGPATH_W) '$(srcdir)/tparm.c'; fi`
- 
-+diskless_exec-graphics.o: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -MT diskless_exec-graphics.o -MD -MP -MF "$(DEPDIR)/diskless_exec-graphics.Tpo" -c -o diskless_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/diskless_exec-graphics.Tpo" "$(DEPDIR)/diskless_exec-graphics.Po"; else rm -f "$(DEPDIR)/diskless_exec-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='diskless_exec-graphics.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -c -o diskless_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
-+
-+diskless_exec-graphics.obj: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -MT diskless_exec-graphics.obj -MD -MP -MF "$(DEPDIR)/diskless_exec-graphics.Tpo" -c -o diskless_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/diskless_exec-graphics.Tpo" "$(DEPDIR)/diskless_exec-graphics.Po"; else rm -f "$(DEPDIR)/diskless_exec-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='diskless_exec-graphics.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -c -o diskless_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
-+
- e2fs_stage1_5_exec-common.o: common.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(e2fs_stage1_5_exec_CFLAGS) $(CFLAGS) -MT e2fs_stage1_5_exec-common.o -MD -MP -MF "$(DEPDIR)/e2fs_stage1_5_exec-common.Tpo" -c -o e2fs_stage1_5_exec-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/e2fs_stage1_5_exec-common.Tpo" "$(DEPDIR)/e2fs_stage1_5_exec-common.Po"; else rm -f "$(DEPDIR)/e2fs_stage1_5_exec-common.Tpo"; exit 1; fi
-@@ -2599,6 +2635,20 @@ pre_stage2_exec-tparm.obj: tparm.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -c -o pre_stage2_exec-tparm.obj `if test -f 'tparm.c'; then $(CYGPATH_W) 'tparm.c'; else $(CYGPATH_W) '$(srcdir)/tparm.c'; fi`
- 
-+pre_stage2_exec-graphics.o: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -MT pre_stage2_exec-graphics.o -MD -MP -MF "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" -c -o pre_stage2_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" "$(DEPDIR)/pre_stage2_exec-graphics.Po"; else rm -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='pre_stage2_exec-graphics.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -c -o pre_stage2_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
-+
-+pre_stage2_exec-graphics.obj: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -MT pre_stage2_exec-graphics.obj -MD -MP -MF "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" -c -o pre_stage2_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" "$(DEPDIR)/pre_stage2_exec-graphics.Po"; else rm -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='pre_stage2_exec-graphics.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -c -o pre_stage2_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
-+
- reiserfs_stage1_5_exec-common.o: common.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reiserfs_stage1_5_exec_CFLAGS) $(CFLAGS) -MT reiserfs_stage1_5_exec-common.o -MD -MP -MF "$(DEPDIR)/reiserfs_stage1_5_exec-common.Tpo" -c -o reiserfs_stage1_5_exec-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/reiserfs_stage1_5_exec-common.Tpo" "$(DEPDIR)/reiserfs_stage1_5_exec-common.Po"; else rm -f "$(DEPDIR)/reiserfs_stage1_5_exec-common.Tpo"; exit 1; fi
-diff -rup grub-0.97.oorig/util/Makefile.in grub-0.97/util/Makefile.in
---- grub-0.97.oorig/util/Makefile.in	2005-05-08 04:42:39.000000000 +0200
-+++ grub-0.97/util/Makefile.in	2006-03-12 14:00:48.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,8 +15,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(mbchk_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -102,6 +100,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
diff --git a/target/x86/grub/grub.200-fix_mbr_handling.patch b/target/x86/grub/grub.200-fix_mbr_handling.patch
deleted file mode 100644
index fdee0ef87..000000000
--- a/target/x86/grub/grub.200-fix_mbr_handling.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- grub-0.97.oorig/stage2/disk_io.c	2004-05-23 18:35:24.000000000 +0200
-+++ grub-0.97/stage2/disk_io.c	2006-03-12 14:11:51.000000000 +0100
-@@ -365,7 +365,7 @@ rawwrite (int drive, int sector, char *b
- int
- devwrite (int sector, int sector_count, char *buf)
- {
--#if defined(GRUB_UTIL) && defined(__linux__)
-+#if defined(GRUB_UTIL) && defined(__linux__) && !defined(SUPPORT_LOOPDEV)
-   if (current_partition != 0xFFFFFF
-       && is_disk_device (device_map, current_drive))
-     {
diff --git a/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch b/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
deleted file mode 100644
index 5b941865b..000000000
--- a/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -rup grub-0.97.orig/grub/asmstub.c grub-0.97/grub/asmstub.c
---- grub-0.97.orig/grub/asmstub.c	2006-11-29 20:36:20.000000000 +0100
-+++ grub-0.97/grub/asmstub.c	2006-11-29 21:26:16.000000000 +0100
-@@ -18,10 +18,13 @@
-  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+#include <features.h>
-+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
- /* Try to use glibc's transparant LFS support. */
- #define _LARGEFILE_SOURCE	1
- /* lseek becomes synonymous with lseek64.  */
- #define _FILE_OFFSET_BITS	64
-+#endif
- 
- /* Simulator entry point. */
- int grub_stage2 (void);
-diff -rup grub-0.97.orig/lib/device.c grub-0.97/lib/device.c
---- grub-0.97.orig/lib/device.c	2006-11-29 20:36:20.000000000 +0100
-+++ grub-0.97/lib/device.c	2006-11-29 21:25:19.000000000 +0100
-@@ -18,10 +18,13 @@
-  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+#include <features.h>
-+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
- /* Try to use glibc's transparant LFS support. */
- #define _LARGEFILE_SOURCE       1
- /* lseek becomes synonymous with lseek64.  */
- #define _FILE_OFFSET_BITS       64
-+#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/target/x86/grub/grub.400-nic_update2.patch.bz2 b/target/x86/grub/grub.400-nic_update2.patch.bz2
deleted file mode 100644
index 8592f15ff..000000000
--- a/target/x86/grub/grub.400-nic_update2.patch.bz2
+++ /dev/null
diff --git a/target/x86/grub/grub.mk b/target/x86/grub/grub.mk
deleted file mode 100644
index af46244f4..000000000
--- a/target/x86/grub/grub.mk
+++ /dev/null
@@ -1,137 +0,0 @@
-GRUB_SUPPORTED_ARCH=n
-ifeq ($(ARCH),i386)
-GRUB_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i486)
-GRUB_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i586)
-GRUB_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i686)
-GRUB_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),x86_64)
-GRUB_SUPPORTED_ARCH=y
-endif
-ifeq ($(GRUB_SUPPORTED_ARCH),y)
-#############################################################
-#
-# grub
-#
-#############################################################
-GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH:=grub_0.97-35.diff.gz
-GRUB_SITE:=http://snapshot.debian.net/archive/2008/03/29/debian/pool/main/g/grub/
-GRUB_PATCH_SITE:=$(GRUB_SITE)
-GRUB_CAT:=$(ZCAT)
-GRUB_DIR:=$(BUILD_DIR)/grub-0.97
-GRUB_BINARY:=grub/grub
-GRUB_TARGET_BINARY:=sbin/grub
-GRUB_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz
-
-
-GRUB_CFLAGS=-DSUPPORT_LOOPDEV
-ifeq ($(BR2_LARGEFILE),)
-GRUB_CFLAGS+=-U_FILE_OFFSET_BITS
-endif
-
-
-GRUB_CONFIG-$(BR2_TARGET_GRUB_SPLASH) += --enable-graphics
-GRUB_CONFIG-$(BR2_TARGET_GRUB_DISKLESS) += --enable-diskless
-GRUB_CONFIG-$(BR2_TARGET_GRUB_3c595) += --enable-3c595
-GRUB_CONFIG-$(BR2_TARGET_GRUB_3c90x) += --enable-3c90x
-GRUB_CONFIG-$(BR2_TARGET_GRUB_davicom) += --enable-davicom
-GRUB_CONFIG-$(BR2_TARGET_GRUB_e1000) += --enable-e1000
-GRUB_CONFIG-$(BR2_TARGET_GRUB_eepro100) += --enable-eepro100
-GRUB_CONFIG-$(BR2_TARGET_GRUB_epic100) += --enable-epic100
-GRUB_CONFIG-$(BR2_TARGET_GRUB_forcedeth) += --enable-forcedeth
-GRUB_CONFIG-$(BR2_TARGET_GRUB_natsemi) += --enable-natsemi
-GRUB_CONFIG-$(BR2_TARGET_GRUB_ns83820) += --enable-ns83820
-GRUB_CONFIG-$(BR2_TARGET_GRUB_ns8390) += --enable-ns8390
-GRUB_CONFIG-$(BR2_TARGET_GRUB_pcnet32) += --enable-pcnet32
-GRUB_CONFIG-$(BR2_TARGET_GRUB_pnic) += --enable-pnic
-GRUB_CONFIG-$(BR2_TARGET_GRUB_rtl8139) += --enable-rtl8139
-GRUB_CONFIG-$(BR2_TARGET_GRUB_r8169) += --enable-r8169
-GRUB_CONFIG-$(BR2_TARGET_GRUB_sis900) += --enable-sis900
-GRUB_CONFIG-$(BR2_TARGET_GRUB_tg3) += --enable-tg3
-GRUB_CONFIG-$(BR2_TARGET_GRUB_tulip) += --enable-tulip
-GRUB_CONFIG-$(BR2_TARGET_GRUB_tlan) += --enable-tlan
-GRUB_CONFIG-$(BR2_TARGET_GRUB_undi) += --enable-undi
-GRUB_CONFIG-$(BR2_TARGET_GRUB_via_rhine) += --enable-via-rhine
-GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840
-
-$(DL_DIR)/$(GRUB_SOURCE):
-	 $(call DOWNLOAD,$(GRUB_SITE),$(GRUB_SOURCE))
-
-$(DL_DIR)/$(GRUB_PATCH):
-	 $(call DOWNLOAD,$(GRUB_PATCH_SITE),$(GRUB_PATCH))
-
-grub-source: $(DL_DIR)/$(GRUB_SOURCE) $(DL_DIR)/$(GRUB_PATCH)
-
-$(GRUB_DIR)/.unpacked: $(DL_DIR)/$(GRUB_SOURCE) $(DL_DIR)/$(GRUB_PATCH)
-	$(GRUB_CAT) $(DL_DIR)/$(GRUB_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	toolchain/patch-kernel.sh $(GRUB_DIR) $(DL_DIR) $(GRUB_PATCH)
-	for i in `grep -v "^#" $(GRUB_DIR)/debian/patches/00list`; do \
-		cat $(GRUB_DIR)/debian/patches/$$i | patch -p1 -d $(GRUB_DIR); \
-	done
-	toolchain/patch-kernel.sh $(GRUB_DIR) target/x86/grub grub.\*.patch{,.bz2}
-	touch $@
-
-$(GRUB_DIR)/.configured: $(GRUB_DIR)/.unpacked
-	(cd $(GRUB_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$(GRUB_CFLAGS)" \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/ \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--disable-auto-linux-mem-opt \
-		$(GRUB_CONFIG-y) \
-	)
-	touch $@
-
-$(GRUB_DIR)/$(GRUB_BINARY): $(GRUB_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(GRUB_DIR)
-	rm -f $(GRUB_DIR)/$(GRUB_BINARY)
-	$(MAKE) CC=$(TARGET_CC) CFLAGS+=-static -C $(GRUB_DIR)/grub grub
-	mkdir -p $(dir $(STAGING_DIR)/$(GRUB_TARGET_BINARY))
-	mv $(GRUB_DIR)/$(GRUB_BINARY) $(STAGING_DIR)/$(GRUB_TARGET_BINARY).static
-	$(MAKE) CC=$(TARGET_CC) -C $(GRUB_DIR)/grub
-
-$(GRUB_DIR)/.installed: $(GRUB_DIR)/$(GRUB_BINARY)
-	cp $(GRUB_DIR)/$(GRUB_BINARY) $(TARGET_DIR)/$(GRUB_TARGET_BINARY)
-	test -d $(TARGET_DIR)/boot/grub || mkdir -p $(TARGET_DIR)/boot/grub
-	cp $(GRUB_DIR)/stage1/stage1 $(GRUB_DIR)/stage2/*1_5 $(GRUB_DIR)/stage2/stage2 $(TARGET_DIR)/boot/grub/
-ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
-	test -f $(TARGET_DIR)/boot/grub/$(GRUB_SPLASHIMAGE) || \
-		cp $(GRUB_SPLASHIMAGE) $(TARGET_DIR)/boot/grub/
-endif
-	touch $@
-
-grub: uclibc $(GRUB_DIR)/.installed
-
-grub-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB_DIR) uninstall
-	-$(MAKE) -C $(GRUB_DIR) clean
-	rm -f $(TARGET_DIR)/boot/grub/$(GRUB_SPLASHIMAGE) \
-		$(TARGET_DIR)/sbin/$(GRUB_BINARY) \
-		$(TARGET_DIR)/boot/grub/{stage{1,2},*1_5}
-
-grub-dirclean:
-	rm -rf $(GRUB_DIR)
-
-endif
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_GRUB),y)
-TARGETS+=grub
-endif
diff --git a/target/x86/grub/menu.lst b/target/x86/grub/menu.lst
deleted file mode 100644
index d76bf6323..000000000
--- a/target/x86/grub/menu.lst
+++ /dev/null
@@ -1,7 +0,0 @@
-default=0
-timeout=5
-splashimage=(hd0,0)/boot/grub/splash.xpm.gz
-hiddenmenu
-title Buildroot
-	root (hd0,0)
-	kernel /boot/bzImage rw root=/dev/hda1 vga=791 
diff --git a/target/x86/grub/splash.xpm.gz b/target/x86/grub/splash.xpm.gz
deleted file mode 100644
index 96e88822a..000000000
--- a/target/x86/grub/splash.xpm.gz
+++ /dev/null
diff --git a/target/x86/grub2/Config.in b/target/x86/grub2/Config.in
deleted file mode 100644
index 752639993..000000000
--- a/target/x86/grub2/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_TARGET_GRUB2
-	bool "grub2"
-	help
-	  The GRand Unified Bootloader for x86 systems, take #2.
-
-config BR2_TARGET_GRUB2_SPLASH
-	bool "Splashimage support"
-	depends on BR2_TARGET_GRUB2
-	help
-	  Add support for splashimage.
-	
-	  A splashimage is a 14-color indexed .xpm picture which
-	  is displayed as background for the grub menu.
diff --git a/target/x86/grub2/grub-1.95-001-fix-grub-install.patch b/target/x86/grub2/grub-1.95-001-fix-grub-install.patch
deleted file mode 100644
index 3287b61c8..000000000
--- a/target/x86/grub2/grub-1.95-001-fix-grub-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-? config.status.lineno
-? fix-grub-install.diff
-? genkernsyms.sh
-? gensymlist.sh
-? grub-mkimage.d
-? grub_script.tab.c
-? grub_script.tab.h
-? kernel_elf_symlist.c
-Index: util/powerpc/ieee1275/grub-install.in
-===================================================================
-RCS file: /cvsroot/grub/grub2/util/powerpc/ieee1275/grub-install.in,v
-retrieving revision 1.5
-diff -u -r1.5 grub-install.in
---- grub-1.95/util/powerpc/ieee1275/grub-install.in	28 May 2006 23:01:43 -0000	1.5
-+++ grub-1.95/util/powerpc/ieee1275/grub-install.in	4 Mar 2007 19:05:47 -0000
-@@ -23,6 +23,7 @@
- # Initialize some variables.
- prefix=@prefix@
- exec_prefix=@exec_prefix@
-+bindir=@bindir@
- sbindir=@sbindir@
- libdir=@libdir@
- PACKAGE_NAME=@PACKAGE_NAME@
diff --git a/target/x86/grub2/grub2.mk b/target/x86/grub2/grub2.mk
deleted file mode 100644
index 46c6471e5..000000000
--- a/target/x86/grub2/grub2.mk
+++ /dev/null
@@ -1,134 +0,0 @@
-GRUB2_SUPPORTED_ARCH=n
-ifeq ($(ARCH),i386)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i486)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i586)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i686)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),x86_64)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(GRUB2_SUPPORTED_ARCH),y)
-#############################################################
-#
-# grub2
-#
-#############################################################
-GRUB2_SOURCE:=grub2_1.95.orig.tar.gz
-GRUB2_PATCH:=grub2_1.95-5.diff.gz
-GRUB2_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
-GRUB2_PATCH_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
-GRUB2_CAT:=$(ZCAT)
-GRUB2_DIR:=$(BUILD_DIR)/grub-1.95
-GRUB2_BINARY:=grub2/grub2
-GRUB2_TARGET_BINARY:=sbin/grub2
-GRUB2_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz
-
-
-GRUB2_CFLAGS=-DSUPPORT_LOOPDEV
-ifeq ($(BR2_LARGEFILE),)
-GRUB2_CFLAGS+=-U_FILE_OFFSET_BITS
-endif
-
-
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_SPLASH) += --enable-graphics
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_DISKLESS) += --enable-diskless
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c595) += --enable-3c595
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c90x) += --enable-3c90x
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_davicom) += --enable-davicom
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_e1000) += --enable-e1000
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_eepro100) += --enable-eepro100
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_epic100) += --enable-epic100
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_forcedeth) += --enable-forcedeth
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_natsemi) += --enable-natsemi
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_ns83820) += --enable-ns83820
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_ns8390) += --enable-ns8390
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_pcnet32) += --enable-pcnet32
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_pnic) += --enable-pnic
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_rtl8139) += --enable-rtl8139
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_r8169) += --enable-r8169
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_sis900) += --enable-sis900
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tg3) += --enable-tg3
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tulip) += --enable-tulip
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tlan) += --enable-tlan
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_undi) += --enable-undi
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_via_rhine) += --enable-via-rhine
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_w89c840) += --enable-w89c840
-
-$(DL_DIR)/$(GRUB2_SOURCE):
-	 $(call DOWNLOAD,$(GRUB2_SITE),$(GRUB2_SOURCE))
-
-$(DL_DIR)/$(GRUB2_PATCH):
-	 $(call DOWNLOAD,$(GRUB2_PATCH_SITE),$(GRUB2_PATCH))
-
-grub2-source: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH)
-
-$(GRUB2_DIR)/.unpacked: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH)
-	$(GRUB2_CAT) $(DL_DIR)/$(GRUB2_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	toolchain/patch-kernel.sh $(GRUB2_DIR) $(DL_DIR) $(GRUB2_PATCH)
-	for i in `grep -v "^#" $(GRUB2_DIR)/debian/patches/00list`; do \
-		cat $(GRUB2_DIR)/debian/patches/$$i | patch -p1 -d $(GRUB2_DIR); \
-	done
-	toolchain/patch-kernel.sh $(GRUB2_DIR) target/x86/grub2 grub-\*.patch
-	touch $@
-
-$(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked
-	(cd $(GRUB2_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		CPPFLAGS="$(GRUB2_CFLAGS)" \
-		grub_cv_i386_check_nested_functions=no \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/ \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--disable-auto-linux-mem-opt \
-		$(DISABLE_LARGEFILE) \
-		$(GRUB2_CONFIG-y) \
-	)
-	touch $@
-
-$(GRUB2_DIR)/$(GRUB2_BINARY): $(GRUB2_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(GRUB2_DIR)
-
-$(GRUB2_DIR)/.installed: $(GRUB2_DIR)/$(GRUB2_BINARY)
-	cp $(GRUB2_DIR)/$(GRUB2_BINARY) $(TARGET_DIR)/$(GRUB2_TARGET_BINARY)
-	test -d $(TARGET_DIR)/boot/grub2 || mkdir -p $(TARGET_DIR)/boot/grub2
-	cp $(GRUB2_DIR)/stage1/stage1 $(GRUB2_DIR)/stage2/*1_5 $(GRUB2_DIR)/stage2/stage2 $(TARGET_DIR)/boot/grub2/
-ifeq ($(BR2_TARGET_GRUB2_SPLASH),y)
-	test -f $(TARGET_DIR)/boot/grub2/$(GRUB2_SPLASHIMAGE) || \
-		cp $(GRUB2_SPLASHIMAGE) $(TARGET_DIR)/boot/grub2/
-endif
-	touch $@
-
-grub2: uclibc $(GRUB2_DIR)/.installed
-
-grub2-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB2_DIR) uninstall
-	-$(MAKE) -C $(GRUB2_DIR) clean
-	rm -f $(TARGET_DIR)/boot/grub2/$(GRUB2_SPLASHIMAGE) \
-		$(TARGET_DIR)/sbin/$(GRUB2_BINARY) \
-		$(TARGET_DIR)/boot/grub2/{stage{1,2},*1_5}
-
-grub2-dirclean:
-	rm -rf $(GRUB2_DIR)
-
-endif
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_GRUB2),y)
-TARGETS+=grub2
-endif
diff --git a/target/x86/syslinux/Config.in b/target/x86/syslinux/Config.in
deleted file mode 100644
index c65bc1f10..000000000
--- a/target/x86/syslinux/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_TARGET_SYSLINUX
-	bool "syslinux"
-	depends on BR2_i386
-	help
-	  The syslinux bootloader for x86 systems.
-	  This includes: syslinux, pxelinux, extlinux.
-
-config BR2_TARGET_PXELINUX
-	bool "pxelinux"
-	depends on BR2_i386 || BR2_x86_64
-	help
-	  The pxelinux loader for x86 systems.
diff --git a/target/x86/syslinux/syslinux-3.82-makefile.patch b/target/x86/syslinux/syslinux-3.82-makefile.patch
deleted file mode 100644
index 9e98a7879..000000000
--- a/target/x86/syslinux/syslinux-3.82-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- syslinux-3.82-org/Makefile	2009-09-17 13:11:23.000000000 +0200
-+++ syslinux-3.82/Makefile	2009-09-17 13:13:32.000000000 +0200
-@@ -42,7 +42,7 @@
- 	mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
- 	mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
- 	core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
--	gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
-+	gpxe/gpxelinux.0 dos/syslinux.com \
- 	$(MODULES)
- 
- # BSUBDIRs build the on-target binary components.
diff --git a/target/x86/syslinux/syslinux.mk b/target/x86/syslinux/syslinux.mk
deleted file mode 100644
index 75d4ad458..000000000
--- a/target/x86/syslinux/syslinux.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-SYSLINUX_SUPPORTED_ARCH=n
-ifeq ($(ARCH),i386)
-SYSLINUX_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i486)
-SYSLINUX_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i586)
-SYSLINUX_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i686)
-SYSLINUX_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),x86_64)
-SYSLINUX_SUPPORTED_ARCH=y
-endif
-ifeq ($(SYSLINUX_SUPPORTED_ARCH),y)
-
-#############################################################
-#
-# syslinux to make target msdos/iso9660 filesystems bootable
-#
-#############################################################
-
-SYSLINUX_VERSION:=3.82
-SYSLINUX_DIR=$(BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
-SYSLINUX_DIR2=$(TOOLCHAIN_DIR)/syslinux-$(SYSLINUX_VERSION)
-SYSLINUX_SOURCE=syslinux-$(SYSLINUX_VERSION).tar.bz2
-SYSLINUX_CAT:=$(BZCAT)
-SYSLINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/
-SYSLINUX_BIN=$(SYSLINUX_DIR2)/mtools/syslinux
-
-
-$(DL_DIR)/$(SYSLINUX_SOURCE):
-	 $(call DOWNLOAD,$(SYSLINUX_SITE),$(SYSLINUX_SOURCE))
-
-syslinux-source: $(DL_DIR)/$(SYSLINUX_SOURCE)
-
-$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH)
-	$(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(SYSLINUX_DIR) target/x86/syslinux/ \*.patch
-	touch -c $@
-
-$(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/Makefile
-	$(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(SYSLINUX_DIR)
-	touch -c $@
-
-syslinux: $(SYSLINUX_DIR)/isolinux.bin
-pxelinux: $(SYSLINUX_DIR)/pxelinux.bin
-
-pxelinux-clean syslinux-clean:
-	rm -f $(SYSLINUX_DIR)/isolinux.bin $(SYSLINUX_DIR)/pxelinux.bin
-	-$(MAKE) -C $(SYSLINUX_DIR) clean
-
-pxelinux-dirclean syslinux-dirclean:
-	rm -rf $(SYSLINUX_DIR)
-
-endif
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_SYSLINUX),y)
-TARGETS+=syslinux
-endif
-ifeq ($(BR2_TARGET_PXELINUX),y)
-TARGETS+=pxelinux
-endif