Merge branch 'rpi-2023.04' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi

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

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 8eefaf2..5b47778 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -47,7 +47,7 @@
 #define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
        #devtypel #instance " "
 
-#if CONFIG_IS_ENABLED(CMD_USB)
+#if IS_ENABLED(CONFIG_CMD_USB)
 # define BOOT_TARGET_USB(func) func(USB, usb, 0)
 #else
 # define BOOT_TARGET_USB(func)
@@ -78,7 +78,7 @@
 #ifndef CONFIG_SPL_BUILD
 #include <environment/ti/dfu.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
        "fdtfile=undefined\0" \
        "finduuid=part uuid mmc 0:2 uuid\0" \
@@ -158,20 +158,17 @@
 #endif
 
 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1                0x44e09000      /* Base EVM has UART0 */
-#define CONFIG_SYS_NS16550_COM2                0x48022000      /* UART1 */
-#define CONFIG_SYS_NS16550_COM3                0x48024000      /* UART2 */
-#define CONFIG_SYS_NS16550_COM4                0x481a6000      /* UART3 */
-#define CONFIG_SYS_NS16550_COM5                0x481a8000      /* UART4 */
-#define CONFIG_SYS_NS16550_COM6                0x481aa000      /* UART5 */
-
-/* PMIC support */
-#define CONFIG_POWER_TPS65910
+#define CFG_SYS_NS16550_COM1           0x44e09000      /* Base EVM has UART0 */
+#define CFG_SYS_NS16550_COM2           0x48022000      /* UART1 */
+#define CFG_SYS_NS16550_COM3           0x48024000      /* UART2 */
+#define CFG_SYS_NS16550_COM4           0x481a6000      /* UART3 */
+#define CFG_SYS_NS16550_COM5           0x481a8000      /* UART4 */
+#define CFG_SYS_NS16550_COM6           0x481aa000      /* UART5 */
 
 #ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 /* NAND: driver related configs */
-#define CONFIG_SYS_NAND_ECCPOS         { 2, 3, 4, 5, 6, 7, 8, 9, \
+#define CFG_SYS_NAND_ECCPOS            { 2, 3, 4, 5, 6, 7, 8, 9, \
                                         10, 11, 12, 13, 14, 15, 16, 17, \
                                         18, 19, 20, 21, 22, 23, 24, 25, \
                                         26, 27, 28, 29, 30, 31, 32, 33, \
@@ -179,8 +176,8 @@
                                         42, 43, 44, 45, 46, 47, 48, 49, \
                                         50, 51, 52, 53, 54, 55, 56, 57, }
 
-#define CONFIG_SYS_NAND_ECCSIZE                512
-#define CONFIG_SYS_NAND_ECCBYTES       14
+#define CFG_SYS_NAND_ECCSIZE           512
+#define CFG_SYS_NAND_ECCBYTES  14
 #endif /* !CONFIG_MTD_RAW_NAND */
 
 /* USB Device Firmware Update support */
@@ -205,8 +202,8 @@
  * 0x4C0000 - 0xFFFFFF : Userland (11 MiB + 256 KiB)
  */
 #if defined(CONFIG_NOR)
-#define CONFIG_SYS_FLASH_BASE          (0x08000000)
-#define CONFIG_SYS_FLASH_SIZE          0x01000000
+#define CFG_SYS_FLASH_BASE             (0x08000000)
+#define CFG_SYS_FLASH_SIZE             0x01000000
 #endif  /* NOR support */
 
 #endif /* ! __CONFIG_AM335X_EVM_H */