Prepare v2023.10

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

diff --git a/include/configs/rut.h b/include/configs/rut.h
index fc31946..4002bc4 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -19,24 +19,22 @@
 #define DDR_PLL_FREQ   303
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE       (256 << 20) /* 256 MiB */
+#define CFG_MAX_RAM_BANK_SIZE  (256 << 20) /* 256 MiB */
 
 /* Watchdog */
 #define WATCHDOG_TRIGGER_GPIO  14
 
-#ifndef CONFIG_SPL_BUILD
-
 /* Use common default */
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "hostname=rut\0" \
        "ubi_off=2048\0"\
        "nand_img_size=0x500000\0" \
        "splashpos=m,m\0" \
        "optargs=fixrtc --no-log consoleblank=0 \0" \
-       CONFIG_ENV_SETTINGS_V1 \
-       CONFIG_ENV_SETTINGS_NAND_V1 \
+       CFG_ENV_SETTINGS_V1 \
+       CFG_ENV_SETTINGS_NAND_V1 \
        "mmc_dev=0\0" \
        "mmc_root=/dev/mmcblk0p2 rw\0" \
        "mmc_root_fs_type=ext4 rootwait\0" \
@@ -59,10 +57,4 @@
                "bootm ${kloadaddr}\0" \
        ""
 
-#ifndef CONFIG_RESTORE_FLASH
-/* set to negative value for no autoboot */
-#endif
-
-#endif /* CONFIG_SPL_BUILD */
-
 #endif /* ! __CONFIG_RUT_H */