Prepare v2023.10

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

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index b2464f9..cae7acd 100644 (file)
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -11,23 +11,18 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Harmony"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA Harmony"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
 
 /* UARTD: keyboard satellite board UART, default */
-#define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1           NV_PA_APB_UARTD_BASE
 #ifdef CONFIG_TEGRA_ENABLE_UARTA
 /* UARTA: debug board UART */
-#define CONFIG_SYS_NS16550_COM2                NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM2           NV_PA_APB_UARTA_BASE
 #endif
 
-#define CONFIG_MACH_TYPE               MACH_TYPE_HARMONY
-
 /* NAND support */
-#define CONFIG_TEGRA_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
 
 /* Environment in NAND (which is 512M), aligned to start of last sector */