Prepare v2023.10

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

diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 1e1e5da..44b4595 100644 (file)
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -9,20 +9,7 @@
 #ifndef _CONFIG_GURUPLUG_H
 #define _CONFIG_GURUPLUG_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-
-/*
- * Standard filesystems
- */
-
-/*
- * mv-plug-common.h should be defined after CMD configs since it used them
- * to enable certain macros
- */
-#include "mv-plug-common.h"
+#include "mv-common.h"
 
 /*
  *  Environment variables configurations
@@ -31,46 +18,16 @@
  * max 4k env size is enough, but in case of nand
  * it has to be rounded to sector size
  */
-/*
- * Environment is right behind U-Boot in flash. Make sure U-Boot
- * doesn't grow into the environment area.
- */
-#define CONFIG_BOARD_SIZE_LIMIT                CONFIG_ENV_OFFSET
 
 /*
  * Default environment variables
  */
-#define CONFIG_BOOTCOMMAND \
-       "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
-       "ubi part root; "                                               \
-       "ubifsmount ubi:rootfs; "                                       \
-       "ubifsload 0x800000 ${kernel}; "                                \
-       "ubifsload 0x700000 ${fdt}; "                                   \
-       "ubifsumount; "                                                 \
-       "fdt addr 0x700000; fdt resize; fdt chosen; "                   \
-       "bootz 0x800000 - 0x700000"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"                                \
        "mtdids=nand0=orion_nand\0"                                     \
-       "mtdparts="CONFIG_MTDPARTS_DEFAULT                      \
        "kernel=/boot/zImage\0"                                         \
        "fdt=/boot/guruplug-server-plus.dtb\0"                          \
        "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
 
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS     {1, 1}  /* enable both ports */
-#define CONFIG_PHY_BASE_ADR    0
-#endif /* CONFIG_CMD_NET */
-
-/*
- * SATA Driver configuration
- */
-#ifdef CONFIG_MVSATA_IDE
-#define CONFIG_SYS_ATA_IDE0_OFFSET     MV_SATA_PORT0_OFFSET
-#endif /*CONFIG_MVSATA_IDE*/
-
 #endif /* _CONFIG_GURUPLUG_H */