[PATCH 3/7] board/km/cent2: migrate to environment text file
Holger Brunck
holger.brunck at hitachienergy.com
Fri Dec 2 18:22:39 CET 2022
Use like the other boards a text file for the environment.
As this is the last user of keymile-common.h we can now remove this
file completely.
Signed-off-by: Holger Brunck <holger.brunck at hitachienergy.com>
---
board/keymile/Kconfig | 12 --
board/keymile/kmcent2/kmcent2.c | 2 +-
board/keymile/kmcent2/kmcent2.env | 37 ++++++
configs/kmcent2_defconfig | 2 +-
include/configs/km/keymile-common.h | 174 ----------------------------
include/configs/kmcent2.h | 74 ------------
scripts/config_whitelist.txt | 15 ---
7 files changed, 39 insertions(+), 277 deletions(-)
create mode 100644 board/keymile/kmcent2/kmcent2.env
delete mode 100644 include/configs/km/keymile-common.h
diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig
index b8f0578a28..46d0897108 100644
--- a/board/keymile/Kconfig
+++ b/board/keymile/Kconfig
@@ -77,18 +77,6 @@ config SYS_CLIPS_BASE
help
IFC Base Address for CLIPS FPGA.
-config KM_CONSOLE_TTY
- string "KM Console"
- default "ttyS0"
- help
- TTY console to use on board.
-
-config KM_DEF_NETDEV
- string "Default Netdevice"
- default "eth0"
- help
- Default netdevice for debug interface
-
config KM_COMMON_ETH_INIT
bool "Common Ethernet Initialization"
default y if ARCH_KIRKWOOD || MPC83xx
diff --git a/board/keymile/kmcent2/kmcent2.c b/board/keymile/kmcent2/kmcent2.c
index 6a1711092b..32fb509dbc 100644
--- a/board/keymile/kmcent2/kmcent2.c
+++ b/board/keymile/kmcent2/kmcent2.c
@@ -34,7 +34,7 @@ static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN];
int checkboard(void)
{
- printf("Board: Hitachi Power Grids %s\n", KM_BOARD_NAME);
+ printf("Board: Hitachi Power Grids kmcent2\n");
return 0;
}
diff --git a/board/keymile/kmcent2/kmcent2.env b/board/keymile/kmcent2/kmcent2.env
new file mode 100644
index 0000000000..7c8f8306c5
--- /dev/null
+++ b/board/keymile/kmcent2/kmcent2.env
@@ -0,0 +1,37 @@
+#include <environment/pg-wcom/common.env>
+
+EEprom_ivm=pca9547:70:9
+arch=ppc_82xx
+boot=bootm ${load_addr_r} - ${fdt_addr_r}
+checkfdt=true
+cramfsloadfdt=cramfsload ${fdt_addr_r} fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb
+fpgacfg=true
+hostname=kmcent2
+hwconfig=fsl_ddr:ctlr_intlv=cacheline
+netdev=eth2
+
+newenv=protect off ENV_DEL_ADDR +CONFIG_ENV_TOTAL_SIZE &&
+ erase ENV_DEL_ADDR +CONFIG_ENV_TOTAL_SIZE &&
+ protect on ENV_DEL_ADDR +CONFIG_ENV_TOTAL_SIZE
+
+set_fdthigh=true
+uimage=uImage
+
+update=protect off CONFIG_SYS_MONITOR_BASE +${filesize} &&
+ erase CONFIG_SYS_MONITOR_BASE +${filesize} &&
+ cp.b ${load_addr_r} CONFIG_SYS_MONITOR_BASE ${filesize} &&
+ protect on CONFIG_SYS_MONITOR_BASE +${filesize}
+ update-nor=protect off CONFIG_SYS_FLASH_BASE +${filesize} &&
+ erase CONFIG_SYS_FLASH_BASE +${filesize} &&
+ cp.b ${load_addr_r} CONFIG_SYS_FLASH_BASE ${filesize} &&
+ protect on CONFIG_SYS_MONITOR_BASE +CONFIG_SYS_MONITOR_LEN
+
+usb_phy_type=utmi
+usb_dr_mode=host
+
+/*
+ * The Linux fsl_fman driver needs to be able to process frames with more
+ * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot
+ * parameters
+ */
+add_default+= fsl_dpaa_fman.fsl_fm_max_frm=1558
diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig
index 48ac85b699..249568df6a 100644
--- a/configs/kmcent2_defconfig
+++ b/configs/kmcent2_defconfig
@@ -17,7 +17,6 @@ CONFIG_SYS_CACHE_STASHING=y
# CONFIG_DEEP_SLEEP is not set
CONFIG_PCIE1=y
CONFIG_SYS_FSL_NUM_CC_PLLS=2
-CONFIG_KM_DEF_NETDEV="eth2"
CONFIG_KM_IVM_BUS=2
CONFIG_SYS_MONITOR_LEN=786432
CONFIG_MP=y
@@ -54,6 +53,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:128k(RCW),128k(fman),128k(QE),12
CONFIG_CMD_UBI=y
# CONFIG_CMD_UBIFS is not set
CONFIG_OF_CONTROL=y
+CONFIG_ENV_SOURCE_FILE="kmcent2"
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
deleted file mode 100644
index 35cf27a2eb..0000000000
--- a/include/configs/km/keymile-common.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2008-2011
- * Heiko Schocher, DENX Software Engineering, hs at denx.de.
- */
-
-#ifndef __CONFIG_KEYMILE_H
-#define __CONFIG_KEYMILE_H
-
-#include <linux/stringify.h>
-
-/*
- * Miscellaneous configurable options
- */
-
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
-
-#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
-#define CONFIG_KM_DEF_ENV_BOOTPARAMS \
- "actual_bank=0\0"
-#endif
-
-#ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT
-#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0"
-#endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */
-
-#ifndef CONFIG_KM_UBI_PART_BOOT_OPTS
-#define CONFIG_KM_UBI_PART_BOOT_OPTS ""
-#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */
-
-#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP
-/* one flash chip only called boot */
-/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
-# define CONFIG_KM_UBI_LINUX_MTD \
- "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \
- CONFIG_KM_UBI_PART_BOOT_OPTS
-# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \
- "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"
-#else /* CONFIG_KM_UBI_PARTITION_NAME_APP */
-/* two flash chips called boot and app */
-/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
-/* app: CONFIG_KM_UBI_PARTITION_NAME_APP */
-# define CONFIG_KM_UBI_LINUX_MTD \
- "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \
- CONFIG_KM_UBI_PART_BOOT_OPTS " " \
- "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
-# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \
- "ubiattach=if test ${boot_bank} -eq 0; then; " \
- "ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \
- "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0"
-#endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */
-
-#ifdef CONFIG_NAND_ECC_BCH
-#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
-#define CONFIG_KM_ECC_MODE " eccmode=bch"
-#else
-#define CONFIG_KM_UIMAGE_NAME "uImage\0"
-#define CONFIG_KM_ECC_MODE
-#endif
-
-/*
- * boottargets
- * - set 'subbootcmds'
- * - set 'bootcmd' and 'altbootcmd'
- * available targets:
- * - 'release': for a standalone system kernel/rootfs from flash
- */
-#define CONFIG_KM_DEF_ENV_BOOTTARGETS \
- "subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt " \
- "set_fdthigh cramfsloadkernel flashargs add_default " \
- "addpanic boot\0" \
- "develop=" \
- "tftp ${load_addr_r} scripts/develop-${arch}.txt && " \
- "env import -t ${load_addr_r} ${filesize} && " \
- "run setup_debug_env\0" \
- "ramfs=" \
- "tftp ${load_addr_r} scripts/ramfs-${arch}.txt && " \
- "env import -t ${load_addr_r} ${filesize} && " \
- "run setup_debug_env\0" \
- ""
-
-/*
- * bootargs
- * - modify 'bootargs'
- *
- * - 'add_default': default bootargs common for all arm/ppc boards
- * - 'addpanic': add kernel panic options
- * - 'flashargs': defaults arguments for flash base boot
- *
- */
-#define CONFIG_KM_DEF_ENV_BOOTARGS \
- "add_default=" \
- "setenv bootargs ${bootargs} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
- ":${hostname}:${netdev}:off:" \
- " console=" CONFIG_KM_CONSOLE_TTY ",${baudrate}" \
- " mem=${kernelmem} init=${init}" \
- CONFIG_KM_ECC_MODE \
- " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\
- " " CONFIG_KM_UBI_LINUX_MTD " " \
- CONFIG_KM_DEF_BOOT_ARGS_CPU \
- "\0" \
- "addpanic=" \
- "setenv bootargs ${bootargs} panic=1 panic_on_oops=1\0" \
- "flashargs=" \
- "setenv bootargs " \
- "root=mtdblock:rootfs${boot_bank} " \
- "rootfstype=squashfs ro\0" \
- ""
-
-/*
- * flash_boot
- * - commands for booting from flash
- *
- * - 'cramfsloadkernel': copy kernel from a cramfs to ram
- * - 'ubiattach': attach ubi partition
- * - 'ubicopy': copy ubi volume to ram
- * - volume names: bootfs0, bootfs1, bootfs2, ...
- *
- * processor specific settings
- * - 'cramfsloadfdt': copy fdt from a cramfs to ram
- */
-#define CONFIG_KM_DEF_ENV_FLASH_BOOT \
- "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \
- "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \
- "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \
- "uimage=" CONFIG_KM_UIMAGE_NAME \
- CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
-
-/*
- * constants
- * - KM specific constants and commands
- *
- * - 'default': setup default environment
- */
-#define CONFIG_KM_DEF_ENV_CONSTANTS \
- "backup_bank=0\0" \
- "release=run newenv; reset\0" \
- "pnvramsize=" __stringify(CONFIG_KM_PNVRAM) "\0" \
- "testbootcmd=setenv boot_bank ${test_bank}; " \
- "run ${subbootcmds}; reset\0" \
- "env_version=1\0" \
- ""
-
-#ifndef CONFIG_KM_DEF_ENV
-#define CONFIG_KM_DEF_ENV \
- CONFIG_KM_DEF_ENV_BOOTPARAMS \
- "netdev=" __stringify(CONFIG_KM_DEF_NETDEV) "\0" \
- CONFIG_KM_DEF_ENV_CPU \
- CONFIG_KM_DEF_ENV_BOOTTARGETS \
- CONFIG_KM_DEF_ENV_BOOTARGS \
- CONFIG_KM_DEF_ENV_FLASH_BOOT \
- CONFIG_KM_DEF_ENV_CONSTANTS \
- "altbootcmd=run bootcmd\0" \
- "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \
- "bootcmd=km_checkbidhwk && " \
- "setenv bootcmd \'if km_checktestboot; then; " \
- "setenv boot_bank ${test_bank}; else; " \
- "setenv boot_bank ${actual_bank}; fi;" \
- "run ${subbootcmds}; reset\' && " \
- "setenv altbootcmd \'setenv boot_bank ${backup_bank}; " \
- "run ${subbootcmds}; reset\' && " \
- "saveenv && saveenv && boot\0" \
- "cramfsloadfdt=" \
- "cramfsload ${fdt_addr_r} " \
- "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \
- "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \
- "init=/sbin/init-overlay.sh\0" \
- "load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \
- "load=tftpboot ${load_addr_r} ${u-boot}\0" \
- ""
-#endif /* CONFIG_KM_DEF_ENV */
-
-#endif /* __CONFIG_KEYMILE_H */
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 2e1459e3e4..54102331a6 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -8,18 +8,6 @@
#ifndef __KMCENT2_H
#define __KMCENT2_H
-#define CONFIG_HOSTNAME "kmcent2"
-#define KM_BOARD_NAME CONFIG_HOSTNAME
-
-/*
- * The Linux fsl_fman driver needs to be able to process frames with more
- * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot
- * parameters
- */
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU "fsl_dpaa_fman.fsl_fm_max_frm=1558"
-
-#include "km/keymile-common.h"
-
/* Application IFC chip selects */
#define SYS_LAWAPP_BASE 0xc0000000
#define SYS_LAWAPP_BASE_PHYS (0xf00000000ull | SYS_LAWAPP_BASE)
@@ -394,66 +382,4 @@ int get_scl(void);
*/
#define CONFIG_SYS_BOOTMAPSZ (64 << 20) /* Initial map for Linux*/
-/*
- * Environment Configuration
- */
-#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */
-#define CONFIG_KM_DEF_ENV
-#endif
-
-#define __USB_PHY_TYPE utmi
-
-#define CONFIG_KM_DEF_ENV_CPU \
- "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \
- "cramfsloadfdt=" \
- "cramfsload ${fdt_addr_r} " \
- "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \
- "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \
- "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \
- " +${filesize} && " \
- "erase " __stringify(CONFIG_SYS_MONITOR_BASE) \
- " +${filesize} && " \
- "cp.b ${load_addr_r} " \
- __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize} && " \
- "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \
- " +${filesize}\0" \
- "update-nor=protect off " __stringify(CONFIG_SYS_FLASH_BASE) \
- " +${filesize} && " \
- "erase " __stringify(CONFIG_SYS_FLASH_BASE) \
- " +${filesize} && " \
- "cp.b ${load_addr_r} " \
- __stringify(CONFIG_SYS_FLASH_BASE) " ${filesize} && " \
- "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \
- " +" __stringify(CONFIG_SYS_MONITOR_LEN) "\0" \
- "set_fdthigh=true\0" \
- "checkfdt=true\0" \
- "fpgacfg=true\0" \
- ""
-
-#define CONFIG_HW_ENV_SETTINGS \
- "hwconfig=fsl_ddr:ctlr_intlv=cacheline\0" \
- "usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \
- "usb_dr_mode=host\0"
-
-#define CONFIG_KM_NEW_ENV \
- "newenv=protect off " __stringify(ENV_DEL_ADDR) \
- " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \
- "erase " __stringify(ENV_DEL_ADDR) \
- " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \
- "protect on " __stringify(ENV_DEL_ADDR) \
- " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0"
-
-/* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */
-#ifndef CONFIG_KM_DEF_ARCH
-#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0"
-#endif
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
- CONFIG_KM_DEF_ENV \
- CONFIG_KM_DEF_ARCH \
- CONFIG_KM_NEW_ENV \
- CONFIG_HW_ENV_SETTINGS \
- "EEprom_ivm=pca9547:70:9\0" \
- ""
-
#endif /* __KMCENT2_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c0f55e41a5..02295c74dd 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -91,23 +91,8 @@ CONFIG_IRAM_BASE
CONFIG_IRAM_END
CONFIG_IRAM_SIZE
CONFIG_IRAM_TOP
-CONFIG_KM_DEF_ARCH
-CONFIG_KM_DEF_BOOT_ARGS_CPU
-CONFIG_KM_DEF_ENV
-CONFIG_KM_DEF_ENV_BOOTARGS
-CONFIG_KM_DEF_ENV_BOOTPARAMS
CONFIG_KM_DEF_ENV_BOOTTARGETS
-CONFIG_KM_DEF_ENV_CONSTANTS
-CONFIG_KM_DEF_ENV_CPU
-CONFIG_KM_DEF_ENV_FLASH_BOOT
-CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
-CONFIG_KM_ECC_MODE
CONFIG_KM_NEW_ENV
-CONFIG_KM_UBI_LINUX_MTD
-CONFIG_KM_UBI_PARTITION_NAME_APP
-CONFIG_KM_UBI_PARTITION_NAME_BOOT
-CONFIG_KM_UBI_PART_BOOT_OPTS
-CONFIG_KM_UIMAGE_NAME
CONFIG_KSNET_CPSW_NUM_PORTS
CONFIG_KSNET_MAC_ID_BASE
CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
--
2.31.1
More information about the U-Boot
mailing list