Merge branch 'master' of git://git.denx.de/u-boot-sunxi

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

diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index fa8e9a2..82c57b6 100644 (file)
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2011, Stefano Babic <sbabic@denx.de>
  *
  * (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
  *
  * Configuration for the woodburn board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __WOODBURN_COMMON_CONFIG_H
@@ -53,7 +52,6 @@
 #define CONFIG_RTC_MC13XXX
 
 /* mmc driver */
-#define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
 
@@ -82,7 +80,6 @@
 #define IMX_FEC_BASE   FEC_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR 0x1
 
-#define CONFIG_MII
 #define CONFIG_DISCOVER_PHY
 
 #define CONFIG_ARP_TIMEOUT     200UL
@@ -99,7 +96,6 @@
 /*
  * Physical Memory Map
  */
-#define CONFIG_NR_DRAM_BANKS   1
 #define PHYS_SDRAM_1           CSD0_BASE_ADDR
 #define PHYS_SDRAM_1_SIZE      (256 * 1024 * 1024)
 
@@ -114,9 +110,6 @@
 /*
  * MTD Command for mtdparts
  */
-#define CONFIG_MTD_DEVICE
-#define CONFIG_FLASH_CFI_MTD
-#define CONFIG_MTD_PARTITIONS
 
 /*
  * FLASH and environment organization
@@ -141,12 +134,8 @@
 /*
  * CFI FLASH driver setup
  */
-#define CONFIG_SYS_FLASH_CFI           /* Flash memory is CFI compliant */
-#define CONFIG_FLASH_CFI_DRIVER
 
 /* A non-standard buffered write algorithm */
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE      /* faster */
-#define CONFIG_SYS_FLASH_PROTECTION    /* Use hardware sector protection */
 
 /*
  * NAND FLASH driver setup
@@ -165,7 +154,7 @@
  * to update uboot and load kernel
  */
 
-#define CONFIG_HOSTNAME woodburn
+#define CONFIG_HOSTNAME "woodburn"
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
@@ -183,9 +172,9 @@
        "addmisc=setenv bootargs ${bootargs} ${misc}\0"                 \
        "loadaddr=80800000\0"                                           \
        "kernel_addr_r=80800000\0"                                      \
-       "hostname=" __stringify(CONFIG_HOSTNAME) "\0"                   \
-       "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0"            \
-       "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0"      \
+       "hostname=" CONFIG_HOSTNAME "\0"                        \
+       "bootfile=" CONFIG_HOSTNAME "/uImage\0"         \
+       "ramdisk_file=" CONFIG_HOSTNAME "/uRamdisk\0"   \
        "flash_self=run ramargs addip addtty addmtd addmisc;"           \
                "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
        "flash_nfs=run nfsargs addip addtty addmtd addmisc;"            \
@@ -199,7 +188,7 @@
                "run ramargs addip addtty addmtd addmisc;"              \
                "bootm ${kernel_addr_r} ${ramdisk_addr_r};"             \
                "else echo Images not loades;fi\0"                      \
-       "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0"          \
+       "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0"               \
        "load=tftp ${loadaddr} ${u-boot}\0"                             \
        "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0"         \
        "update=protect off ${uboot_addr} +80000;"                      \