Prepare v2023.10

[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 dfae8ce..6740ab2 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -13,11 +13,9 @@
 
 /* uart */
 /* The following table includes the supported baudrates */
-# define CONFIG_SYS_BAUDRATE_TABLE \
+# define CFG_SYS_BAUDRATE_TABLE \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-#define        CONFIG_HOSTNAME         "microblaze-generic"
-
 /* architecture dependent code */
 #if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
 #define BOOT_TARGET_DEVICES_PXE(func)  func(PXE, pxe, na)
@@ -78,8 +76,8 @@
 
 #include <config_distro_bootcmd.h>
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
        "unlock=yes\0"\
        "nor0=flash-0\0"\
        "mtdparts=mtdparts=flash-0:"\
@@ -95,6 +93,6 @@
 
 /* SPL part */
 
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 
 #endif /* __CONFIG_H */