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

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

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 4b1eb7b..7d1ff2a 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -11,24 +11,15 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING      "Compulab Trimslice"
+#define CFG_TEGRA_BOARD_STRING "Compulab Trimslice"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_TEGRA_UARTA_GPU
-#define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
-
-#define CONFIG_MACH_TYPE               MACH_TYPE_TRIMSLICE
+#define CFG_SYS_NS16550_COM1           NV_PA_APB_UARTA_BASE
 
 /* SPI */
-#define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 
 /* Environment in SPI */
-#define CONFIG_ENV_SPI_MAX_HZ          48000000
-#define CONFIG_ENV_SPI_MODE            SPI_MODE_0
-#define CONFIG_ENV_SECT_SIZE           CONFIG_ENV_SIZE
 /* 1MiB flash, environment located as high as possible */
-#define CONFIG_ENV_OFFSET              (SZ_1M - CONFIG_ENV_SIZE)
 
 #include "tegra-common-post.h"