arm: Finish migration of CONFIG_MACH_TYPE

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

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 776d7d7..5bcc3a6 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -40,17 +40,11 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK     18432000        /* 18.432MHz crystal */
 
 /* misc settings */
-#define CONFIG_CMDLINE_TAG             /* pass commandline to Kernel */
-#define CONFIG_SETUP_MEMORY_TAGS       /* pass memory defs to kernel */
-#define CONFIG_INITRD_TAG              /* pass initrd param to kernel */
-#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* U-Boot is loaded by a bootloader */
 
 /* We set the max number of command args high to avoid HUSH bugs. */
 #define CONFIG_SYS_MAXARGS    32
 
 /* setting board specific options */
-#define CONFIG_MACH_TYPE               MACH_TYPE_SMARTWEB
-#define CONFIG_ENV_OVERWRITE    1 /* Overwrite ethaddr / serial# */
 #define CONFIG_SYS_AUTOLOAD "yes"
 #define CONFIG_RESET_TO_RETRY
 
@@ -69,12 +63,6 @@
  * Perform a SDRAM Memtest from the start of SDRAM
  * till the beginning of the U-Boot position in RAM.
  */
-#define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_TEXT_BASE - 0x100000)
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN \
-       ROUND(3 * CONFIG_ENV_SIZE + (4 * SZ_1M), 0x1000)
 
 /* NAND flash settings */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
@@ -87,11 +75,9 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY            /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO               /* enable the GPIO features */
 #define CONFIG_AT91_GPIO_PULLUP        1       /* keep pullups on peripheral pins */
 
 /* serial console */
-#define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE              ATMEL_BASE_DBGU
 #define CONFIG_USART_ID                        ATMEL_ID_SYS
 
@@ -106,7 +92,7 @@
 
 /* BOOTP and DHCP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
        "setenv autoload yes; setenv autoboot yes; "                    \
        "setenv bootargs ${basicargs} ${mtdparts} "                     \
        "root=/dev/nfs ip=dhcp nfsroot=${serverip}:/srv/nfs/rootfs; "   \
@@ -127,7 +113,6 @@
 #define CONFIG_USB_GADGET_AT91
 
 /* DFU class support */
-#define CONFIG_SYS_DFU_DATA_BUF_SIZE   SZ_1M
 #define DFU_MANIFEST_POLL_TIMEOUT      25000
 #endif
 
@@ -136,18 +121,9 @@
 #define CONFIG_SYS_CBSIZE              512
 
 /*
- * RAM Memory address where to put the
- * Linux Kernel befor starting.
- */
-#define CONFIG_SYS_LOAD_ADDR           0x22000000
-
-/*
  * The NAND Flash partitions:
  */
-#define CONFIG_ENV_OFFSET              (0x100000)
-#define CONFIG_ENV_OFFSET_REDUND       (0x180000)
 #define CONFIG_ENV_RANGE               (SZ_512K)
-#define CONFIG_ENV_SIZE                        (SZ_128K)
 
 /*
  * Predefined environment variables.
@@ -184,9 +160,6 @@
 
 #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14)
 #define CONFIG_SYS_USE_NANDFLASH       1
-#define CONFIG_SPL_NAND_DRIVERS
-#define CONFIG_SPL_NAND_BASE
-#define CONFIG_SPL_NAND_ECC
 #define CONFIG_SPL_NAND_RAW_ONLY
 #define CONFIG_SPL_NAND_SOFTECC
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x20000