Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / enbw_cmc.h

diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index 3fc07e672aa62236a385462437119b7ba11a6698..90033fa10f8c9591ce8b8c32021fb886701d6b35 100644 (file)
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -9,19 +9,7 @@
  *
  * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
  *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -71,7 +59,6 @@
 #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024)
 
 #define CONFIG_NR_DRAM_BANKS   1 /* we have 1 bank of DRAM */
-#define CONFIG_STACKSIZE       (256*1024) /* regular stack */
 
 /*
  * Serial Driver info
@@ -119,8 +106,8 @@
 #define CONFIG_SYS_NAND_PAGE_2K
 #define CONFIG_SYS_NAND_CS             3
 #define CONFIG_SYS_NAND_BASE           DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
-#define CONFIG_SYS_CLE_MASK            0x10
-#define CONFIG_SYS_ALE_MASK            0x8
+#define CONFIG_SYS_NAND_MASK_CLE               0x10
+#define CONFIG_SYS_NAND_MASK_ALE               0x8
 #undef CONFIG_SYS_NAND_HW_ECC
 #define CONFIG_SYS_MAX_NAND_DEVICE     1 /* Max number of NAND devices */
 
@@ -148,7 +135,6 @@
  */
 #ifdef CONFIG_DRIVER_TI_EMAC
 #define CONFIG_MII
-#define CONFIG_BOOTP_DEFAULT
 #define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
@@ -183,18 +169,15 @@
 #define CONFIG_DEFAULT_SETTINGS_ADDR   (CONFIG_ENV_ADDR_REDUND + \
                                                CONFIG_ENV_SECT_SIZE)
 
-#define xstr(s)        str(s)
-#define str(s) #s
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "u-boot_addr_r=c0000000\0"                                      \
-       "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin\0"                 \
+       "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0"          \
        "load=tftp ${u-boot_addr_r} ${u-boot}\0"                        \
-       "update=protect off " xstr(CONFIG_SYS_FLASH_BASE) " +${filesize};"\
-               "erase " xstr(CONFIG_SYS_FLASH_BASE) " +${filesize};"   \
-               "cp.b ${u-boot_addr_r} " xstr(CONFIG_SYS_FLASH_BASE)    \
+       "update=protect off " __stringify(CONFIG_SYS_FLASH_BASE) " +${filesize};"\
+               "erase " __stringify(CONFIG_SYS_FLASH_BASE) " +${filesize};"    \
+               "cp.b ${u-boot_addr_r} " __stringify(CONFIG_SYS_FLASH_BASE)     \
                " ${filesize};"                                         \
-               "protect on " xstr(CONFIG_SYS_FLASH_BASE) " +${filesize}\0"\
+               "protect on " __stringify(CONFIG_SYS_FLASH_BASE) " +${filesize}\0"\
        "netdev=eth0\0"                                                 \
        "rootpath=/opt/eldk-arm/arm\0"                                  \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
@@ -206,9 +189,9 @@
        "kernel_addr_r=c0700000\0"                                      \
        "fdt_addr_r=c0600000\0"                                         \
        "ramdisk_addr_r=c0b00000\0"                                     \
-       "fdt_file=" xstr(CONFIG_HOSTNAME) "/"                           \
-               xstr(CONFIG_HOSTNAME) ".dtb\0"                          \
-       "kernel_file=" xstr(CONFIG_HOSTNAME) "/uImage \0"               \
+       "fdt_file=" __stringify(CONFIG_HOSTNAME) "/"                    \
+               __stringify(CONFIG_HOSTNAME) ".dtb\0"                   \
+       "kernel_file=" __stringify(CONFIG_HOSTNAME) "/uImage \0"        \
        "nand_ld_ramdsk=nand read ${ramdisk_addr_r} 320000 400000\0"    \
        "nand_ld_kernel=nand read ${kernel_addr_r} 20000 300000\0"      \
        "nand_ld_fdt=nand read ${fdt_addr_r} 0 2000\0"                  \
@@ -458,6 +441,7 @@
 
 #define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_SYS_BOOTCOUNT_ADDR      DAVINCI_RTC_BASE
+#define CONFIG_SYS_BOOTCOUNT_BE
 
 #define CONFIG_SYS_NAND_U_BOOT_DST     0xc0080000
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x60004000