Merge https://source.denx.de/u-boot/custodians/u-boot-riscv

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

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index bc0bf04..ca749ed 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -21,11 +21,6 @@
 # define CONFIG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-/* setting reset address */
-/*#define      CONFIG_SYS_RESET_ADDRESS        CONFIG_SYS_TEXT_BASE*/
-
-#define CONFIG_SYS_MALLOC_LEN  0xC0000
-
 /* Stack location before relocation */
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_TEXT_BASE - \
                                         CONFIG_SYS_MALLOC_F_LEN)
@@ -34,7 +29,6 @@
 /* ?empty sector */
 # define CONFIG_SYS_FLASH_EMPTY_INFO   1
 /* max number of memory banks */
-# define CONFIG_SYS_MAX_FLASH_BANKS    1
 /* max number of sectors on one chip */
 # define CONFIG_SYS_MAX_FLASH_SECT     2048
 #endif
@@ -55,14 +49,10 @@
 #define        CONFIG_SYS_CBSIZE       512
 /* max number of command args */
 #define        CONFIG_SYS_MAXARGS      15
-/* default load address */
-#define        CONFIG_SYS_LOAD_ADDR    0
 
 #define        CONFIG_HOSTNAME         "microblaze-generic"
 
 /* architecture dependent code */
-#define        CONFIG_SYS_USR_EXCEP    /* user exception */
-
 #if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
 #define BOOT_TARGET_DEVICES_PXE(func)  func(PXE, pxe, na)
 #else
@@ -81,6 +71,20 @@
 # define BOOT_TARGET_DEVICES_QSPI(func)
 #endif
 
+#if defined(CONFIG_MTD_NOR_FLASH)
+# define BOOT_TARGET_DEVICES_NOR(func)  func(NOR, nor, na)
+#else
+# define BOOT_TARGET_DEVICES_NOR(func)
+#endif
+
+#define BOOTENV_DEV_NOR(devtypeu, devtypel, instance) \
+       "bootcmd_nor=cp.b ${script_offset_nor} ${scriptaddr} ${script_size_f} && " \
+               "echo NOR: Trying to boot script at ${scriptaddr} && " \
+               "source ${scriptaddr}; echo NOR: SCRIPT FAILED: continuing...;\0"
+
+#define BOOTENV_DEV_NAME_NOR(devtypeu, devtypel, instance) \
+       "nor "
+
 #define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \
        "bootcmd_qspi=sf probe 0 0 0 && " \
        "sf read ${scriptaddr} ${script_offset_f} ${script_size_f} && " \
@@ -101,7 +105,8 @@
 
 #define BOOT_TARGET_DEVICES(func) \
        BOOT_TARGET_DEVICES_JTAG(func) \
-       BOOT_TARGET_DEVICES_QSPI(func)  \
+       BOOT_TARGET_DEVICES_QSPI(func) \
+       BOOT_TARGET_DEVICES_NOR(func) \
        BOOT_TARGET_DEVICES_DHCP(func) \
        BOOT_TARGET_DEVICES_PXE(func)