Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master'

[platform/kernel/u-boot.git] / include / configs / atngw100mkii.h

diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index bd4dca5..35eae76 100644 (file)
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -12,7 +12,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AVR32
 #define CONFIG_AT32AP
 #define CONFIG_AT32AP7000
 #define CONFIG_ATNGW100MKII
@@ -152,6 +151,7 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      135
 
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
+#define CONFIG_SYS_TEXT_BASE           0x00000000
 
 #define CONFIG_SYS_INTRAM_BASE         INTERNAL_SRAM_BASE
 #define CONFIG_SYS_INTRAM_SIZE         INTERNAL_SRAM_SIZE
@@ -164,7 +164,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INTRAM_BASE + CONFIG_SYS_INTRAM_SIZE)
 
 #define CONFIG_SYS_MALLOC_LEN          (256*1024)
-#define CONFIG_SYS_DMA_ALLOC_LEN       (16384)
 
 /* Allow 4MB for the kernel run-time image */
 #define CONFIG_SYS_LOAD_ADDR           (EBI_SDRAM_BASE + 0x00400000)