[PATCH 00/22] x86: Move some boards to text environment
This series starts the process of moving x86 boards to a text environment.
This includes conversions for about half the boards.
The rest (including the more complicated Chromebooks) can come in a later series.
Simon Glass (22): doc: Explain how to avoid the distro-boot scripts env: Use include/env for text-environment includes env: Explain how to use #include files in text environment x86: Drop CFG_SYS_STACK_SIZE x86: i8254: Include required ibmpc.h header x86: edison: Drop inclusion of ibmpc.h x86: Drop inclusion of ibmpc.h x86: Drop unused distro settings x86: Add a common include for environment settings x86: coreboot: Convert to text environment x86: crownbay: Convert to text environment x86: bayleybay: Convert to text environment x86: galileo: Convert to text environment x86: edison: Convert to text environment x86: cherryhill: Convert to text environment x86: cougarcanyon2: Convert to text environment x86: minnowmax: Convert to text environment x86: slimbootloader: Convert to text environment x86: efi-x86_app: Convert to text environment x86: efi-x86_payload: Convert to text environment x86: qemu: Add required linux/sizes.h include x86: qemu-x86: Convert to text environment
arch/x86/cpu/qemu/dram.c | 1 + arch/x86/cpu/qemu/e820.c | 1 + arch/x86/lib/i8254.c | 1 + arch/x86/lib/physmem.c | 3 +- board/coreboot/coreboot/coreboot.env | 9 +++++ board/efi/efi-x86_app/efi-x86_app.env | 6 ++++ board/efi/efi-x86_payload/efi-x86_payload.env | 6 ++++ board/emulation/qemu-x86/qemu-x86.env | 6 ++++ board/intel/bayleybay/bayleybay.env | 9 +++++ board/intel/cherryhill/cherryhill.env | 9 +++++ board/intel/cougarcanyon2/cougarcanyon2.env | 6 ++++ board/intel/crownbay/crownbay.env | 6 ++++ board/intel/edison/edison.env | 6 ++++ board/intel/galileo/galileo.env | 11 ++++++ board/intel/minnowmax/minnowmax.env | 11 ++++++ board/intel/slimbootloader/slimbootloader.env | 25 +++++++++++++ board/keymile/km83xx/km83xx.env | 4 +-- board/keymile/kmcent2/kmcent2.env | 2 +- .../keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 2 +- .../keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 2 +- board/siemens/iot2050/iot2050.env | 2 +- board/ti/am62ax/am62ax.env | 4 +-- board/ti/am62x/am62x.env | 4 +-- board/ti/am64x/am64x.env | 6 ++-- board/ti/am65x/am65x.env | 8 ++--- board/ti/j721e/j721e.env | 10 +++--- board/ti/j721s2/j721s2.env | 10 +++--- board/ti/ks2_evm/k2e_evm.env | 4 +-- board/ti/ks2_evm/k2g_evm.env | 6 ++-- board/ti/ks2_evm/k2hk_evm.env | 4 +-- board/ti/ks2_evm/k2l_evm.env | 4 +-- doc/usage/environment.rst | 8 ++++- include/configs/am335x_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/am62ax_evm.h | 4 +-- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 4 +-- include/configs/am65x_evm.h | 6 ++-- include/configs/bayleybay.h | 17 --------- include/configs/cherryhill.h | 13 ------- include/configs/coreboot.h | 20 ----------- include/configs/cougarcanyon2.h | 13 ------- include/configs/crownbay.h | 17 --------- include/configs/da850evm.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/edison.h | 11 ------ include/configs/efi-x86_app.h | 11 ------ include/configs/efi-x86_payload.h | 17 --------- include/configs/galileo.h | 19 ---------- include/configs/minnowmax.h | 16 --------- include/configs/omap3_evm.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/phycore_am335x_r2.h | 4 +-- include/configs/qemu-x86.h | 23 ------------ include/configs/sifive-unleashed.h | 2 +- include/configs/slimbootloader.h | 35 ------------------- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 4 +-- include/configs/x86-common.h | 19 ---------- include/{environment => env}/distro/sf.h | 0 .../{environment => env}/pg-wcom/common.env | 0 .../{environment => env}/pg-wcom/ls102xa.env | 2 +- .../{environment => env}/pg-wcom/powerpc.env | 0 include/{environment => env}/ti/dfu.h | 0 include/{environment => env}/ti/k3_dfu.env | 0 include/{environment => env}/ti/k3_dfu.h | 0 include/{environment => env}/ti/k3_rproc.env | 0 include/{environment => env}/ti/k3_rproc.h | 0 include/{environment => env}/ti/mmc.env | 0 include/{environment => env}/ti/mmc.h | 0 include/{environment => env}/ti/nand.env | 0 include/{environment => env}/ti/nand.h | 0 .../ti/ti_armv7_common.env | 0 .../ti/ti_armv7_keystone2.env | 0 include/{environment => env}/ti/ufs.env | 0 include/{environment => env}/ti/ufs.h | 0 include/env/x86.env | 20 +++++++++++ 78 files changed, 200 insertions(+), 291 deletions(-) create mode 100644 board/coreboot/coreboot/coreboot.env create mode 100644 board/efi/efi-x86_app/efi-x86_app.env create mode 100644 board/efi/efi-x86_payload/efi-x86_payload.env create mode 100644 board/emulation/qemu-x86/qemu-x86.env create mode 100644 board/intel/bayleybay/bayleybay.env create mode 100644 board/intel/cherryhill/cherryhill.env create mode 100644 board/intel/cougarcanyon2/cougarcanyon2.env create mode 100644 board/intel/crownbay/crownbay.env create mode 100644 board/intel/edison/edison.env create mode 100644 board/intel/galileo/galileo.env create mode 100644 board/intel/minnowmax/minnowmax.env create mode 100644 board/intel/slimbootloader/slimbootloader.env rename include/{environment => env}/distro/sf.h (100%) rename include/{environment => env}/pg-wcom/common.env (100%) rename include/{environment => env}/pg-wcom/ls102xa.env (95%) rename include/{environment => env}/pg-wcom/powerpc.env (100%) rename include/{environment => env}/ti/dfu.h (100%) rename include/{environment => env}/ti/k3_dfu.env (100%) rename include/{environment => env}/ti/k3_dfu.h (100%) rename include/{environment => env}/ti/k3_rproc.env (100%) rename include/{environment => env}/ti/k3_rproc.h (100%) rename include/{environment => env}/ti/mmc.env (100%) rename include/{environment => env}/ti/mmc.h (100%) rename include/{environment => env}/ti/nand.env (100%) rename include/{environment => env}/ti/nand.h (100%) rename include/{environment => env}/ti/ti_armv7_common.env (100%) rename include/{environment => env}/ti/ti_armv7_keystone2.env (100%) rename include/{environment => env}/ti/ufs.env (100%) rename include/{environment => env}/ti/ufs.h (100%) create mode 100644 include/env/x86.env
Now that standard boot is available, mention this in the environment documentation.
Signed-off-by: Simon Glass sjg@chromium.org ---
doc/usage/environment.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index 2c44e5da6aa0..91dc07b17bce 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -94,7 +94,7 @@ to add environment variables.
Board maintainers are encouraged to migrate to the text-based environment as it is easier to maintain. The distro-board script still requires the old-style -environment but work is underway to address this. +environments, so use :doc:`../develop/bootstd` instead.
List of environment variables
The 'environment' word is too long. We mostly use 'env' in U-Boot, so use that as the name of the include directory too.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/keymile/km83xx/km83xx.env | 4 ++-- board/keymile/kmcent2/kmcent2.env | 2 +- board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 2 +- board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 2 +- board/siemens/iot2050/iot2050.env | 2 +- board/ti/am62ax/am62ax.env | 4 ++-- board/ti/am62x/am62x.env | 4 ++-- board/ti/am64x/am64x.env | 6 +++--- board/ti/am65x/am65x.env | 8 ++++---- board/ti/j721e/j721e.env | 10 +++++----- board/ti/j721s2/j721s2.env | 10 +++++----- board/ti/ks2_evm/k2e_evm.env | 4 ++-- board/ti/ks2_evm/k2g_evm.env | 6 +++--- board/ti/ks2_evm/k2hk_evm.env | 4 ++-- board/ti/ks2_evm/k2l_evm.env | 4 ++-- include/configs/am335x_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/am62ax_evm.h | 4 ++-- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 4 ++-- include/configs/am65x_evm.h | 6 +++--- include/configs/da850evm.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/phycore_am335x_r2.h | 4 ++-- include/configs/sifive-unleashed.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 4 ++-- include/{environment => env}/distro/sf.h | 0 include/{environment => env}/pg-wcom/common.env | 0 include/{environment => env}/pg-wcom/ls102xa.env | 2 +- include/{environment => env}/pg-wcom/powerpc.env | 0 include/{environment => env}/ti/dfu.h | 0 include/{environment => env}/ti/k3_dfu.env | 0 include/{environment => env}/ti/k3_dfu.h | 0 include/{environment => env}/ti/k3_rproc.env | 0 include/{environment => env}/ti/k3_rproc.h | 0 include/{environment => env}/ti/mmc.env | 0 include/{environment => env}/ti/mmc.h | 0 include/{environment => env}/ti/nand.env | 0 include/{environment => env}/ti/nand.h | 0 include/{environment => env}/ti/ti_armv7_common.env | 0 include/{environment => env}/ti/ti_armv7_keystone2.env | 0 include/{environment => env}/ti/ufs.env | 0 include/{environment => env}/ti/ufs.h | 0 47 files changed, 58 insertions(+), 58 deletions(-) rename include/{environment => env}/distro/sf.h (100%) rename include/{environment => env}/pg-wcom/common.env (100%) rename include/{environment => env}/pg-wcom/ls102xa.env (95%) rename include/{environment => env}/pg-wcom/powerpc.env (100%) rename include/{environment => env}/ti/dfu.h (100%) rename include/{environment => env}/ti/k3_dfu.env (100%) rename include/{environment => env}/ti/k3_dfu.h (100%) rename include/{environment => env}/ti/k3_rproc.env (100%) rename include/{environment => env}/ti/k3_rproc.h (100%) rename include/{environment => env}/ti/mmc.env (100%) rename include/{environment => env}/ti/mmc.h (100%) rename include/{environment => env}/ti/nand.env (100%) rename include/{environment => env}/ti/nand.h (100%) rename include/{environment => env}/ti/ti_armv7_common.env (100%) rename include/{environment => env}/ti/ti_armv7_keystone2.env (100%) rename include/{environment => env}/ti/ufs.env (100%) rename include/{environment => env}/ti/ufs.h (100%)
diff --git a/board/keymile/km83xx/km83xx.env b/board/keymile/km83xx/km83xx.env index ed2487c028d0..1f13aaa88231 100644 --- a/board/keymile/km83xx/km83xx.env +++ b/board/keymile/km83xx/km83xx.env @@ -13,8 +13,8 @@ netdev=eth0 uimage=uImage #endif
-#include <environment/pg-wcom/common.env> -#include <environment/pg-wcom/powerpc.env> +#include <env/pg-wcom/common.env> +#include <env/pg-wcom/powerpc.env>
#if CONFIG_TARGET_KMCOGE5NE add_default+= eccmode=bch diff --git a/board/keymile/kmcent2/kmcent2.env b/board/keymile/kmcent2/kmcent2.env index 6b676a4ceb8b..efa762e55899 100644 --- a/board/keymile/kmcent2/kmcent2.env +++ b/board/keymile/kmcent2/kmcent2.env @@ -1,4 +1,4 @@ -#include <environment/pg-wcom/common.env> +#include <env/pg-wcom/common.env>
EEprom_ivm=pca9547:70:9 arch=ppc_82xx diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env b/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env index d960de6bfe01..1054dbf9f542 100644 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env @@ -1,3 +1,3 @@ -#include <environment/pg-wcom/ls102xa.env> +#include <env/pg-wcom/ls102xa.env>
hostname=EXPU1 diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env b/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env index 4031f8bee958..1232fe9da8bc 100644 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env @@ -1,3 +1,3 @@ -#include <environment/pg-wcom/ls102xa.env> +#include <env/pg-wcom/ls102xa.env>
hostname=SELI8 diff --git a/board/siemens/iot2050/iot2050.env b/board/siemens/iot2050/iot2050.env index 7fd836e62857..caa9f80e3fca 100644 --- a/board/siemens/iot2050/iot2050.env +++ b/board/siemens/iot2050/iot2050.env @@ -6,7 +6,7 @@ * Jan Kiszka jan.kiszka@siemens.com */
-#include <environment/ti/ti_armv7_common.env> +#include <env/ti/ti_armv7_common.env>
usb_pgood_delay=900
diff --git a/board/ti/am62ax/am62ax.env b/board/ti/am62ax/am62ax.env index 491ec973bbc6..3f7c333fa404 100644 --- a/board/ti/am62ax/am62ax.env +++ b/board/ti/am62ax/am62ax.env @@ -1,5 +1,5 @@ -#include <environment/ti/ti_armv7_common.env> -#include <environment/ti/mmc.env> +#include <env/ti/ti_armv7_common.env> +#include <env/ti/mmc.env>
default_device_tree=ti/k3-am62a7-sk.dtb findfdt= diff --git a/board/ti/am62x/am62x.env b/board/ti/am62x/am62x.env index bb37d21de61b..f2dc87893a92 100644 --- a/board/ti/am62x/am62x.env +++ b/board/ti/am62x/am62x.env @@ -1,5 +1,5 @@ -#include <environment/ti/ti_armv7_common.env> -#include <environment/ti/mmc.env> +#include <env/ti/ti_armv7_common.env> +#include <env/ti/mmc.env>
default_device_tree=ti/k3-am625-sk.dtb findfdt= diff --git a/board/ti/am64x/am64x.env b/board/ti/am64x/am64x.env index ecb07366fc8a..1567907fcbdc 100644 --- a/board/ti/am64x/am64x.env +++ b/board/ti/am64x/am64x.env @@ -1,6 +1,6 @@ -#include <environment/ti/ti_armv7_common.env> -#include <environment/ti/mmc.env> -#include <environment/ti/k3_dfu.env> +#include <env/ti/ti_armv7_common.env> +#include <env/ti/mmc.env> +#include <env/ti/k3_dfu.env>
findfdt= if test $board_name = am64x_gpevm; then diff --git a/board/ti/am65x/am65x.env b/board/ti/am65x/am65x.env index 036f4752835a..755bff2707c8 100644 --- a/board/ti/am65x/am65x.env +++ b/board/ti/am65x/am65x.env @@ -1,8 +1,8 @@ -#include <environment/ti/ti_armv7_common.env> -#include <environment/ti/mmc.env> -#include <environment/ti/k3_dfu.env> +#include <env/ti/ti_armv7_common.env> +#include <env/ti/mmc.env> +#include <env/ti/k3_dfu.env> #if CONFIG_CMD_REMOTEPROC -#include <environment/ti/k3_rproc.env> +#include <env/ti/k3_rproc.env> #endif
findfdt= diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env index f7a4880bf835..2f2fb0591279 100644 --- a/board/ti/j721e/j721e.env +++ b/board/ti/j721e/j721e.env @@ -1,10 +1,10 @@ -#include <environment/ti/ti_armv7_common.env> -#include <environment/ti/mmc.env> -#include <environment/ti/ufs.env> -#include <environment/ti/k3_dfu.env> +#include <env/ti/ti_armv7_common.env> +#include <env/ti/mmc.env> +#include <env/ti/ufs.env> +#include <env/ti/k3_dfu.env>
#if CONFIG_CMD_REMOTEPROC -#include <environment/ti/k3_rproc.env> +#include <env/ti/k3_rproc.env> #endif
default_device_tree=ti/k3-j721e-common-proc-board.dtb diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env index 2ec652dbdd3e..6825b1469854 100644 --- a/board/ti/j721s2/j721s2.env +++ b/board/ti/j721s2/j721s2.env @@ -1,10 +1,10 @@ -#include <environment/ti/ti_armv7_common.env> -#include <environment/ti/mmc.env> -#include <environment/ti/ufs.env> -#include <environment/ti/k3_dfu.env> +#include <env/ti/ti_armv7_common.env> +#include <env/ti/mmc.env> +#include <env/ti/ufs.env> +#include <env/ti/k3_dfu.env>
#if CONFIG_CMD_REMOTEPROC -#include <environment/ti/k3_rproc.env> +#include <env/ti/k3_rproc.env> #endif
default_device_tree=ti/k3-j721s2-common-proc-board.dtb diff --git a/board/ti/ks2_evm/k2e_evm.env b/board/ti/ks2_evm/k2e_evm.env index 746e4065a2c0..a145db53e5fa 100644 --- a/board/ti/ks2_evm/k2e_evm.env +++ b/board/ti/ks2_evm/k2e_evm.env @@ -1,5 +1,5 @@ -#include <environment/ti/ti_armv7_common.env> -#include <environment/ti/ti_armv7_keystone2.env> +#include <env/ti/ti_armv7_common.env> +#include <env/ti/ti_armv7_keystone2.env>
findfdt=setenv fdtfile ${name_fdt} boot=ubi diff --git a/board/ti/ks2_evm/k2g_evm.env b/board/ti/ks2_evm/k2g_evm.env index 72807ac87a6a..4f4941dd0907 100644 --- a/board/ti/ks2_evm/k2g_evm.env +++ b/board/ti/ks2_evm/k2g_evm.env @@ -1,6 +1,6 @@ -#include <environment/ti/ti_armv7_common.env> -#include <environment/ti/ti_armv7_keystone2.env> -#include <environment/ti/mmc.env> +#include <env/ti/ti_armv7_common.env> +#include <env/ti/ti_armv7_keystone2.env> +#include <env/ti/mmc.env>
set_name_pmmc=setenv name_pmmc ti-sci-firmware-k2g.bin dev_pmmc=0 diff --git a/board/ti/ks2_evm/k2hk_evm.env b/board/ti/ks2_evm/k2hk_evm.env index f1cdc7060368..0714a51090ef 100644 --- a/board/ti/ks2_evm/k2hk_evm.env +++ b/board/ti/ks2_evm/k2hk_evm.env @@ -1,5 +1,5 @@ -#include <environment/ti/ti_armv7_common.env> -#include <environment/ti/ti_armv7_keystone2.env> +#include <env/ti/ti_armv7_common.env> +#include <env/ti/ti_armv7_keystone2.env>
findfdt=setenv fdtfile ${name_fdt} boot=ubi diff --git a/board/ti/ks2_evm/k2l_evm.env b/board/ti/ks2_evm/k2l_evm.env index ddb5cd4aadc6..e8a803a4ed76 100644 --- a/board/ti/ks2_evm/k2l_evm.env +++ b/board/ti/ks2_evm/k2l_evm.env @@ -1,5 +1,5 @@ -#include <environment/ti/ti_armv7_common.env> -#include <environment/ti/ti_armv7_keystone2.env> +#include <env/ti/ti_armv7_common.env> +#include <env/ti/ti_armv7_keystone2.env>
findfdt=setenv fdtfile ${name_fdt} boot=ubi diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 5b4777851742..504b1f02283e 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -76,7 +76,7 @@ #include <config_distro_bootcmd.h>
#ifndef CONFIG_SPL_BUILD -#include <environment/ti/dfu.h> +#include <env/ti/dfu.h>
#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index a2f73c475434..7ee7b7e4f4fb 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -64,7 +64,7 @@ #include <config_distro_bootcmd.h>
#ifndef CONFIG_SPL_BUILD -#include <environment/ti/dfu.h> +#include <env/ti/dfu.h>
#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index ba91f2b0545b..06edde69028d 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -11,7 +11,7 @@ #ifndef __CONFIG_AM57XX_EVM_H #define __CONFIG_AM57XX_EVM_H
-#include <environment/ti/dfu.h> +#include <env/ti/dfu.h> #include <linux/sizes.h>
#define CFG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */ diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h index 3997ce558a45..57003f120f9a 100644 --- a/include/configs/am62ax_evm.h +++ b/include/configs/am62ax_evm.h @@ -9,8 +9,8 @@ #define __CONFIG_AM62AX_EVM_H
#include <linux/sizes.h> -#include <environment/ti/mmc.h> -#include <environment/ti/k3_dfu.h> +#include <env/ti/mmc.h> +#include <env/ti/k3_dfu.h>
/* DDR Configuration */ #define CFG_SYS_SDRAM_BASE1 0x880000000 diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h index 6b2a6ee0d0ca..44180dc7687b 100644 --- a/include/configs/am62x_evm.h +++ b/include/configs/am62x_evm.h @@ -10,7 +10,7 @@ #define __CONFIG_AM625_EVM_H
#include <config_distro_bootcmd.h> -#include <environment/ti/mmc.h> +#include <env/ti/mmc.h>
/* DDR Configuration */ #define CFG_SYS_SDRAM_BASE1 0x880000000 diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index 1e37ab47b9a3..062102a610d3 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -11,9 +11,9 @@
#include <linux/sizes.h> #include <config_distro_bootcmd.h> -#include <environment/ti/mmc.h> +#include <env/ti/mmc.h> #include <asm/arch/am64_hardware.h> -#include <environment/ti/k3_dfu.h> +#include <env/ti/k3_dfu.h>
/* DDR Configuration */ #define CFG_SYS_SDRAM_BASE1 0x880000000 diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 2fa658d53961..9e90239a1c18 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -10,9 +10,9 @@ #define __CONFIG_AM654_EVM_H
#include <linux/sizes.h> -#include <environment/ti/mmc.h> -#include <environment/ti/k3_rproc.h> -#include <environment/ti/k3_dfu.h> +#include <env/ti/mmc.h> +#include <env/ti/k3_rproc.h> +#include <env/ti/k3_dfu.h>
/* DDR Configuration */ #define CFG_SYS_SDRAM_BASE1 0x880000000 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 736af88a0247..cef404218ed4 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -143,7 +143,7 @@ "fdtaddr=0xc0600000\0" \ "scriptaddr=0xc0600000\0"
-#include <environment/ti/mmc.h> +#include <env/ti/mmc.h>
#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index ef1d5a112608..633ec1f32fa5 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -11,7 +11,7 @@ #ifndef __CONFIG_DRA7XX_EVM_H #define __CONFIG_DRA7XX_EVM_H
-#include <environment/ti/dfu.h> +#include <env/ti/dfu.h>
#define CFG_MAX_MEM_MAPPED 0x80000000
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index adb25a62970c..f44967787c97 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -67,7 +67,7 @@
#include <config_distro_bootcmd.h>
-#include <environment/ti/mmc.h> +#include <env/ti/mmc.h>
#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index af0093511a02..fc2655a17b91 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -135,7 +135,7 @@ "fdtaddr=0xc0600000\0" \ "scriptaddr=0xc0600000\0"
-#include <environment/ti/mmc.h> +#include <env/ti/mmc.h>
#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h index 4e6dc79f41b2..8668da6eba5d 100644 --- a/include/configs/phycore_am335x_r2.h +++ b/include/configs/phycore_am335x_r2.h @@ -59,8 +59,8 @@ func(NAND, nand, 0)
#include <config_distro_bootcmd.h> -#include <environment/ti/dfu.h> -#include <environment/ti/mmc.h> +#include <env/ti/dfu.h> +#include <env/ti/mmc.h>
#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_MMC_TI_ARGS \ diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h index f208f5e20db9..2996b375723a 100644 --- a/include/configs/sifive-unleashed.h +++ b/include/configs/sifive-unleashed.h @@ -26,7 +26,7 @@ func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> -#include <environment/distro/sf.h> +#include <env/distro/sf.h>
#define TYPE_GUID_LOADER1 "5B193300-FC78-40CD-8002-E86C45580B47" #define TYPE_GUID_LOADER2 "2E54B353-1271-4842-806F-E436D6AF6985" diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 9e312ac16d1a..c4f116aabf80 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -56,7 +56,7 @@ func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> -#include <environment/ti/mmc.h> +#include <env/ti/mmc.h>
#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 74a39c40785c..4e5aa74147d4 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -39,8 +39,8 @@ #define DFUARGS #endif
-#include <environment/ti/mmc.h> -#include <environment/ti/nand.h> +#include <env/ti/mmc.h> +#include <env/ti/nand.h>
#ifndef CONSOLEDEV #define CONSOLEDEV "ttyS2" diff --git a/include/environment/distro/sf.h b/include/env/distro/sf.h similarity index 100% rename from include/environment/distro/sf.h rename to include/env/distro/sf.h diff --git a/include/environment/pg-wcom/common.env b/include/env/pg-wcom/common.env similarity index 100% rename from include/environment/pg-wcom/common.env rename to include/env/pg-wcom/common.env diff --git a/include/environment/pg-wcom/ls102xa.env b/include/env/pg-wcom/ls102xa.env similarity index 95% rename from include/environment/pg-wcom/ls102xa.env rename to include/env/pg-wcom/ls102xa.env index 5b5bda95e283..abbec4245742 100644 --- a/include/environment/pg-wcom/ls102xa.env +++ b/include/env/pg-wcom/ls102xa.env @@ -1,6 +1,6 @@ #define WCOM_UBI_PARTITION_APP
-#include <environment/pg-wcom/common.env> +#include <env/pg-wcom/common.env>
EEprom_ivm=pca9547:70:9 boot=bootm $load_addr_r - $fdt_addr_r diff --git a/include/environment/pg-wcom/powerpc.env b/include/env/pg-wcom/powerpc.env similarity index 100% rename from include/environment/pg-wcom/powerpc.env rename to include/env/pg-wcom/powerpc.env diff --git a/include/environment/ti/dfu.h b/include/env/ti/dfu.h similarity index 100% rename from include/environment/ti/dfu.h rename to include/env/ti/dfu.h diff --git a/include/environment/ti/k3_dfu.env b/include/env/ti/k3_dfu.env similarity index 100% rename from include/environment/ti/k3_dfu.env rename to include/env/ti/k3_dfu.env diff --git a/include/environment/ti/k3_dfu.h b/include/env/ti/k3_dfu.h similarity index 100% rename from include/environment/ti/k3_dfu.h rename to include/env/ti/k3_dfu.h diff --git a/include/environment/ti/k3_rproc.env b/include/env/ti/k3_rproc.env similarity index 100% rename from include/environment/ti/k3_rproc.env rename to include/env/ti/k3_rproc.env diff --git a/include/environment/ti/k3_rproc.h b/include/env/ti/k3_rproc.h similarity index 100% rename from include/environment/ti/k3_rproc.h rename to include/env/ti/k3_rproc.h diff --git a/include/environment/ti/mmc.env b/include/env/ti/mmc.env similarity index 100% rename from include/environment/ti/mmc.env rename to include/env/ti/mmc.env diff --git a/include/environment/ti/mmc.h b/include/env/ti/mmc.h similarity index 100% rename from include/environment/ti/mmc.h rename to include/env/ti/mmc.h diff --git a/include/environment/ti/nand.env b/include/env/ti/nand.env similarity index 100% rename from include/environment/ti/nand.env rename to include/env/ti/nand.env diff --git a/include/environment/ti/nand.h b/include/env/ti/nand.h similarity index 100% rename from include/environment/ti/nand.h rename to include/env/ti/nand.h diff --git a/include/environment/ti/ti_armv7_common.env b/include/env/ti/ti_armv7_common.env similarity index 100% rename from include/environment/ti/ti_armv7_common.env rename to include/env/ti/ti_armv7_common.env diff --git a/include/environment/ti/ti_armv7_keystone2.env b/include/env/ti/ti_armv7_keystone2.env similarity index 100% rename from include/environment/ti/ti_armv7_keystone2.env rename to include/env/ti/ti_armv7_keystone2.env diff --git a/include/environment/ti/ufs.env b/include/env/ti/ufs.env similarity index 100% rename from include/environment/ti/ufs.env rename to include/env/ti/ufs.env diff --git a/include/environment/ti/ufs.h b/include/env/ti/ufs.h similarity index 100% rename from include/environment/ti/ufs.h rename to include/env/ti/ufs.h
Provide documentation on how to share common settings among boards.
Signed-off-by: Simon Glass sjg@chromium.org ---
doc/usage/environment.rst | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index 91dc07b17bce..c6439dde6689 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -81,6 +81,12 @@ Example:: echo CONFIG_SYS_BOARD boot failed - please check your image echo Load address is CONFIG_SYS_LOAD_ADDR
+Settings which are common to a group of boards can use #include to bring in +a common file in the `include/env` directory, containing environment +settings. For example:: + + #include <env/ti/mmc.env> + If CONFIG_ENV_SOURCE_FILE is empty and the default filename is not present, then the old-style C environment is used instead. See below.
This is only used in one file and the value is the same for both boards which define it. Use the fixed value of 32KB and drop the CFG. This will allow removal of the config.h files.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/x86/lib/physmem.c | 3 ++- include/configs/edison.h | 4 ---- include/configs/x86-common.h | 10 ---------- 3 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c index 1eb97ac5bb17..382f768149f4 100644 --- a/arch/x86/lib/physmem.c +++ b/arch/x86/lib/physmem.c @@ -14,6 +14,7 @@ #include <asm/cpu.h> #include <asm/global_data.h> #include <linux/compiler.h> +#include <linux/sizes.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -144,7 +145,7 @@ static void x86_phys_memset_page(phys_addr_t map_addr, uintptr_t offset, int c,
/* Make sure the window is below U-Boot. */ assert(window + LARGE_PAGE_SIZE < - gd->relocaddr - CONFIG_SYS_MALLOC_LEN - CFG_SYS_STACK_SIZE); + gd->relocaddr - CONFIG_SYS_MALLOC_LEN - SZ_32K); /* Map the page into the window and then memset the appropriate part. */ x86_phys_map_page(window, map_addr, 1); memset((void *)(window + offset), c, size); diff --git a/include/configs/edison.h b/include/configs/edison.h index 455a889b64c1..558c74d7b469 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -8,8 +8,4 @@
#include <asm/ibmpc.h>
-/* Miscellaneous configurable options */ - -#define CFG_SYS_STACK_SIZE (32 * 1024) - #endif diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index c1c5a09a35c7..608c5ba7b0a6 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -10,16 +10,6 @@ #ifndef __CONFIG_X86_COMMON_H #define __CONFIG_X86_COMMON_H
-/*----------------------------------------------------------------------- - * CPU Features - */ - -#define CFG_SYS_STACK_SIZE (32 * 1024) - -/*----------------------------------------------------------------------- - * Environment configuration - */ - /*----------------------------------------------------------------------- * USB configuration */
This is needed for this file, so include it here explicitly.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/x86/lib/i8254.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/x86/lib/i8254.c b/arch/x86/lib/i8254.c index 0f975389103d..a8d1db188ece 100644 --- a/arch/x86/lib/i8254.c +++ b/arch/x86/lib/i8254.c @@ -7,6 +7,7 @@ #include <common.h> #include <asm/io.h> #include <asm/i8254.h> +#include <asm/ibmpc.h>
#define TIMER1_VALUE 18 /* 15.6us */ #define BEEP_FREQUENCY_HZ 440
This should be included by files that need it, not the config.h file. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
include/configs/edison.h | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/include/configs/edison.h b/include/configs/edison.h index 558c74d7b469..127c2c4546e0 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -2,10 +2,3 @@ /* * Copyright (c) 2017 Intel Corp. */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include <asm/ibmpc.h> - -#endif
This is not needed in this file anymore. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
include/configs/x86-common.h | 2 -- 1 file changed, 2 deletions(-)
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 608c5ba7b0a6..e05f667d7226 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -5,8 +5,6 @@ * Graeme Russ, graeme.russ@gmail.com. */
-#include <asm/ibmpc.h> - #ifndef __CONFIG_X86_COMMON_H #define __CONFIG_X86_COMMON_H
No x86 board uses distro boot, so drop these settings.
Signed-off-by: Simon Glass sjg@chromium.org ---
include/configs/x86-common.h | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index e05f667d7226..8bd0716c08d2 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -20,18 +20,11 @@ #define CFG_OTHBOOTARGS "othbootargs=acpi=off\0" #endif
-#if defined(CONFIG_DISTRO_DEFAULTS) -#define DISTRO_BOOTENV BOOTENV -#else -#define DISTRO_BOOTENV -#endif - #ifndef SPLASH_SETTINGS #define SPLASH_SETTINGS #endif
#define CFG_EXTRA_ENV_SETTINGS \ - DISTRO_BOOTENV \ CFG_STD_DEVICES_SETTINGS \ SPLASH_SETTINGS \ "pciconfighost=1\0" \
Create a text-file version of x86-common.h which can be used by x86 boards.
Signed-off-by: Simon Glass sjg@chromium.org ---
include/env/x86.env | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 include/env/x86.env
diff --git a/include/env/x86.env b/include/env/x86.env new file mode 100644 index 000000000000..d00d98f70a1f --- /dev/null +++ b/include/env/x86.env @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +/* + * Copyright (c) 2011 The Chromium OS Authors. + * (C) Copyright 2008 + * Graeme Russ, graeme.russ@gmail.com + */ + +pciconfighost=1 +netdev=eth0 +consoledev=ttyS0 +scriptaddr=0x7000000 +kernel_addr_r=0x1000000 +ramdisk_addr_r=0x4000000 +ramdiskfile=initramfs.gz + +/* common console settings */ +stdin=serial,i8042-kbd,usbkbd +stdout=serial,vidconsole +stderr=serial,vidconsole
Use the common include and add some options specific to this board.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/coreboot/coreboot/coreboot.env | 9 +++++++++ include/configs/coreboot.h | 20 -------------------- 2 files changed, 9 insertions(+), 20 deletions(-) create mode 100644 board/coreboot/coreboot/coreboot.env
diff --git a/board/coreboot/coreboot/coreboot.env b/board/coreboot/coreboot/coreboot.env new file mode 100644 index 000000000000..0f5bb6fb624b --- /dev/null +++ b/board/coreboot/coreboot/coreboot.env @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2018, Bin Meng bmeng.cn@gmail.com + */ + +#include <env/x86.env> + +splashsource=virtio_fs +splashimage=0x1000000 diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index b4f49bf5289d..e00c408f29a5 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -2,23 +2,3 @@ /* * Copyright (C) 2018, Bin Meng bmeng.cn@gmail.com */ - -/* - * board/config.h - configuration options, board specific - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#define SPLASH_SETTINGS "splashsource=virtio_fs\0" \ - "splashimage=0x1000000\0" - -#include <configs/x86-common.h> - -#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ - "stdout=serial,vidconsole\0" \ - "stderr=serial,vidconsole\0" - -/* ATA/IDE support */ - -#endif /* __CONFIG_H */
Use the common include.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/intel/crownbay/crownbay.env | 6 ++++++ include/configs/crownbay.h | 17 ----------------- 2 files changed, 6 insertions(+), 17 deletions(-) create mode 100644 board/intel/crownbay/crownbay.env
diff --git a/board/intel/crownbay/crownbay.env b/board/intel/crownbay/crownbay.env new file mode 100644 index 000000000000..9e95414c002e --- /dev/null +++ b/board/intel/crownbay/crownbay.env @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com + */ + +#include <env/x86.env> diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 387bb8800e89..0c842dd01ebe 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -2,20 +2,3 @@ /* * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */ - -/* - * board/config.h - configuration options, board specific - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include <configs/x86-common.h> - -#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ - "stdout=serial,vidconsole\0" \ - "stderr=serial,vidconsole\0" - -/* Environment configuration */ - -#endif /* __CONFIG_H */
Use the common include.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/intel/bayleybay/bayleybay.env | 9 +++++++++ include/configs/bayleybay.h | 17 ----------------- 2 files changed, 9 insertions(+), 17 deletions(-) create mode 100644 board/intel/bayleybay/bayleybay.env
diff --git a/board/intel/bayleybay/bayleybay.env b/board/intel/bayleybay/bayleybay.env new file mode 100644 index 000000000000..89e1849fa83a --- /dev/null +++ b/board/intel/bayleybay/bayleybay.env @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com + */ + +#include <env/x86.env> + +/* don't use i8042-kbd */ +stdin=serial,usbkbd diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index b0df328cd84b..9b0f5cedcd79 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -2,20 +2,3 @@ /* * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */ - -/* - * board/config.h - configuration options, board specific - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include <configs/x86-common.h> - -#define CFG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \ - "stdout=serial,vidconsole\0" \ - "stderr=serial,vidconsole\0" - -/* Environment configuration */ - -#endif /* __CONFIG_H */
Use the common include.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/intel/galileo/galileo.env | 11 +++++++++++ include/configs/galileo.h | 19 ------------------- 2 files changed, 11 insertions(+), 19 deletions(-) create mode 100644 board/intel/galileo/galileo.env
diff --git a/board/intel/galileo/galileo.env b/board/intel/galileo/galileo.env new file mode 100644 index 000000000000..83e77bb300ac --- /dev/null +++ b/board/intel/galileo/galileo.env @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com + */ + +#include <env/x86.env> + +/* use just serial */ +stdin=serial +stdout=serial +stderr=serial diff --git a/include/configs/galileo.h b/include/configs/galileo.h index 0380ac287be2..9b0f5cedcd79 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -2,22 +2,3 @@ /* * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */ - -/* - * board/config.h - configuration options, board specific - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include <configs/x86-common.h> - -/* ns16550 UART is memory-mapped in Quark SoC */ - -#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ - "stdout=serial\0" \ - "stderr=serial\0" - -/* Environment configuration */ - -#endif /* __CONFIG_H */
Don't use the common include since Edison's environment is empty.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/intel/edison/edison.env | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 board/intel/edison/edison.env
diff --git a/board/intel/edison/edison.env b/board/intel/edison/edison.env new file mode 100644 index 000000000000..c7d4de7b0399 --- /dev/null +++ b/board/intel/edison/edison.env @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2017 Intel Corp. + */ + +/* empty environment */
Use the common include.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/intel/cherryhill/cherryhill.env | 9 +++++++++ include/configs/cherryhill.h | 13 ------------- 2 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 board/intel/cherryhill/cherryhill.env
diff --git a/board/intel/cherryhill/cherryhill.env b/board/intel/cherryhill/cherryhill.env new file mode 100644 index 000000000000..929b6a18a745 --- /dev/null +++ b/board/intel/cherryhill/cherryhill.env @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2017, Bin Meng bmeng.cn@gmail.com + */ + +#include <env/x86.env> + +/* don't use i8042-kbd */ +stdin=serial,usbkbd diff --git a/include/configs/cherryhill.h b/include/configs/cherryhill.h index d6ce70a96aea..a3009571de98 100644 --- a/include/configs/cherryhill.h +++ b/include/configs/cherryhill.h @@ -2,16 +2,3 @@ /* * Copyright (C) 2017, Bin Meng bmeng.cn@gmail.com */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include <configs/x86-common.h> - -#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ - "stdout=vidconsole,serial\0" \ - "stderr=vidconsole,serial\0" - -/* Environment configuration */ - -#endif /* __CONFIG_H */
Use the common include. The existing environment includes "vga" but that is not valid anymore, so let it use vidconsole
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/intel/cougarcanyon2/cougarcanyon2.env | 6 ++++++ include/configs/cougarcanyon2.h | 13 ------------- 2 files changed, 6 insertions(+), 13 deletions(-) create mode 100644 board/intel/cougarcanyon2/cougarcanyon2.env
diff --git a/board/intel/cougarcanyon2/cougarcanyon2.env b/board/intel/cougarcanyon2/cougarcanyon2.env new file mode 100644 index 000000000000..6329b0f330bf --- /dev/null +++ b/board/intel/cougarcanyon2/cougarcanyon2.env @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2016, Bin Meng bmeng.cn@gmail.com + */ + +#include <env/x86.env> diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h index 31639e48da88..0406786f7c66 100644 --- a/include/configs/cougarcanyon2.h +++ b/include/configs/cougarcanyon2.h @@ -2,16 +2,3 @@ /* * Copyright (C) 2016, Bin Meng bmeng.cn@gmail.com */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include <configs/x86-common.h> - -#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ - "stdout=serial,vga\0" \ - "stderr=serial,vga\0" - -/* Environment configuration */ - -#endif /* __CONFIG_H */
Use the common include along with some additions.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/intel/minnowmax/minnowmax.env | 11 +++++++++++ include/configs/minnowmax.h | 16 ---------------- 2 files changed, 11 insertions(+), 16 deletions(-) create mode 100644 board/intel/minnowmax/minnowmax.env
diff --git a/board/intel/minnowmax/minnowmax.env b/board/intel/minnowmax/minnowmax.env new file mode 100644 index 000000000000..71f3607843b3 --- /dev/null +++ b/board/intel/minnowmax/minnowmax.env @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2015 Google, Inc + */ + +#include <env/x86.env> + +/* don't use i8042-kbd */ +stdin=usbkbd,serial + +usb_pgood_delay=40 diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 842672d55751..068a2af2c1fc 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -2,19 +2,3 @@ /* * Copyright (C) 2015 Google, Inc */ - -/* - * board/config.h - configuration options, board specific - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include <configs/x86-common.h> - -#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \ - "stdout=vidconsole,serial\0" \ - "stderr=vidconsole,serial\0" \ - "usb_pgood_delay=40\0" - -#endif /* __CONFIG_H */
Use the common include along with some additions.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/intel/slimbootloader/slimbootloader.env | 25 +++++++++++++ include/configs/slimbootloader.h | 35 ------------------- 2 files changed, 25 insertions(+), 35 deletions(-) create mode 100644 board/intel/slimbootloader/slimbootloader.env
diff --git a/board/intel/slimbootloader/slimbootloader.env b/board/intel/slimbootloader/slimbootloader.env new file mode 100644 index 000000000000..5fceb808a946 --- /dev/null +++ b/board/intel/slimbootloader/slimbootloader.env @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + */ + +#include <env/x86.env> + +/* don't use video */ +stdout=serial +stderr=serial + +usb_pgood_delay=40 + +netdev=eth0 +consoledev=ttyS0 +ramdiskaddr=0x4000000 +ramdiskfile=initrd +bootdev=usb +bootdevnum=0 +bootdevpart=0 +bootfsload=fatload +bootusb=setenv bootdev usb; boot +bootscsi=setenv bootdev scsi; boot +bootmmc=setenv bootdev mmc; boot +bootargs=console=ttyS0,115200 console=tty0 diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h index 20b99a1021df..85f6a968e040 100644 --- a/include/configs/slimbootloader.h +++ b/include/configs/slimbootloader.h @@ -2,38 +2,3 @@ /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ - -#ifndef __SLIMBOOTLOADER_CONFIG_H__ -#define __SLIMBOOTLOADER_CONFIG_H__ - -#include <configs/x86-common.h> - -#define CFG_STD_DEVICES_SETTINGS \ - "stdin=serial,i8042-kbd,usbkbd\0" \ - "stdout=serial\0" \ - "stderr=serial\0" - -/* - * Override CFG_EXTRA_ENV_SETTINGS in x86-common.h - */ -#undef CFG_EXTRA_ENV_SETTINGS -#define CFG_EXTRA_ENV_SETTINGS \ - CFG_STD_DEVICES_SETTINGS \ - "netdev=eth0\0" \ - "consoledev=ttyS0\0" \ - "ramdiskaddr=0x4000000\0" \ - "ramdiskfile=initrd\0" \ - "bootdev=usb\0" \ - "bootdevnum=0\0" \ - "bootdevpart=0\0" \ - "bootfsload=fatload\0" \ - "bootusb=setenv bootdev usb; boot\0" \ - "bootscsi=setenv bootdev scsi; boot\0" \ - "bootmmc=setenv bootdev mmc; boot\0" \ - "bootargs=console=ttyS0,115200 console=tty0\0" - -/* - * Override CONFIG_BOOTCOMMAND in x86-common.h - */ - -#endif /* __SLIMBOOTLOADER_CONFIG_H__ */
On Mon, Jul 31, 2023 at 11:02 AM Simon Glass sjg@chromium.org wrote:
Use the common include along with some additions.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org
board/intel/slimbootloader/slimbootloader.env | 25 +++++++++++++ include/configs/slimbootloader.h | 35 ------------------- 2 files changed, 25 insertions(+), 35 deletions(-) create mode 100644 board/intel/slimbootloader/slimbootloader.env
diff --git a/board/intel/slimbootloader/slimbootloader.env b/board/intel/slimbootloader/slimbootloader.env new file mode 100644 index 000000000000..5fceb808a946 --- /dev/null +++ b/board/intel/slimbootloader/slimbootloader.env @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/*
- Copyright (C) 2019 Intel Corporation <www.intel.com>
- */
+#include <env/x86.env>
+/* don't use video */ +stdout=serial +stderr=serial
+usb_pgood_delay=40
+netdev=eth0 +consoledev=ttyS0
The above 2 are not needed since they are in x86.env
+ramdiskaddr=0x4000000 +ramdiskfile=initrd +bootdev=usb +bootdevnum=0 +bootdevpart=0 +bootfsload=fatload +bootusb=setenv bootdev usb; boot +bootscsi=setenv bootdev scsi; boot +bootmmc=setenv bootdev mmc; boot +bootargs=console=ttyS0,115200 console=tty0 diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h index 20b99a1021df..85f6a968e040 100644 --- a/include/configs/slimbootloader.h +++ b/include/configs/slimbootloader.h @@ -2,38 +2,3 @@ /*
- Copyright (C) 2019 Intel Corporation <www.intel.com>
*/
-#ifndef __SLIMBOOTLOADER_CONFIG_H__ -#define __SLIMBOOTLOADER_CONFIG_H__
-#include <configs/x86-common.h>
-#define CFG_STD_DEVICES_SETTINGS \
"stdin=serial,i8042-kbd,usbkbd\0" \"stdout=serial\0" \"stderr=serial\0"-/*
- Override CFG_EXTRA_ENV_SETTINGS in x86-common.h
- */
-#undef CFG_EXTRA_ENV_SETTINGS -#define CFG_EXTRA_ENV_SETTINGS \
CFG_STD_DEVICES_SETTINGS \"netdev=eth0\0" \"consoledev=ttyS0\0" \"ramdiskaddr=0x4000000\0" \"ramdiskfile=initrd\0" \"bootdev=usb\0" \"bootdevnum=0\0" \"bootdevpart=0\0" \"bootfsload=fatload\0" \"bootusb=setenv bootdev usb; boot\0" \"bootscsi=setenv bootdev scsi; boot\0" \"bootmmc=setenv bootdev mmc; boot\0" \"bootargs=console=ttyS0,115200 console=tty0\0"-/*
- Override CONFIG_BOOTCOMMAND in x86-common.h
- */
-#endif /* __SLIMBOOTLOADER_CONFIG_H__ */
Otherwise LGTM
Use the common include. Drop the unnecessary changes, since missing stdio drivers will be ignored.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/efi/efi-x86_app/efi-x86_app.env | 6 ++++++ include/configs/efi-x86_app.h | 11 ----------- 2 files changed, 6 insertions(+), 11 deletions(-) create mode 100644 board/efi/efi-x86_app/efi-x86_app.env
diff --git a/board/efi/efi-x86_app/efi-x86_app.env b/board/efi/efi-x86_app/efi-x86_app.env new file mode 100644 index 000000000000..106836af1ff8 --- /dev/null +++ b/board/efi/efi-x86_app/efi-x86_app.env @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2015 Google, Inc + */ + +#include <env/x86.env> diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h index 843ed8b9d1db..d5824049d697 100644 --- a/include/configs/efi-x86_app.h +++ b/include/configs/efi-x86_app.h @@ -2,14 +2,3 @@ /* * Copyright (c) 2015 Google, Inc */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include <configs/x86-common.h> - -#define CFG_STD_DEVICES_SETTINGS "stdin=serial\0" \ - "stdout=vidconsole\0" \ - "stderr=vidconsole\0" - -#endif
Use the common include.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/efi/efi-x86_payload/efi-x86_payload.env | 6 ++++++ include/configs/efi-x86_payload.h | 17 ----------------- 2 files changed, 6 insertions(+), 17 deletions(-) create mode 100644 board/efi/efi-x86_payload/efi-x86_payload.env
diff --git a/board/efi/efi-x86_payload/efi-x86_payload.env b/board/efi/efi-x86_payload/efi-x86_payload.env new file mode 100644 index 000000000000..6a656287060d --- /dev/null +++ b/board/efi/efi-x86_payload/efi-x86_payload.env @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2018, Bin Meng bmeng.cn@gmail.com + */ + +#include <env/x86.env> diff --git a/include/configs/efi-x86_payload.h b/include/configs/efi-x86_payload.h index c72b067c367d..e00c408f29a5 100644 --- a/include/configs/efi-x86_payload.h +++ b/include/configs/efi-x86_payload.h @@ -2,20 +2,3 @@ /* * Copyright (C) 2018, Bin Meng bmeng.cn@gmail.com */ - -/* - * board/config.h - configuration options, board specific - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include <configs/x86-common.h> - -#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \ - "stdout=serial,vidconsole\0" \ - "stderr=serial,vidconsole\0" - -/* ATA/IDE support */ - -#endif /* __CONFIG_H */
These files rely on the config.h file provided this include. Add it explictily so we can move to a text environment.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/x86/cpu/qemu/dram.c | 1 + arch/x86/cpu/qemu/e820.c | 1 + 2 files changed, 2 insertions(+)
diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c index 595c397d4a4f..1a52d1dc5228 100644 --- a/arch/x86/cpu/qemu/dram.c +++ b/arch/x86/cpu/qemu/dram.c @@ -8,6 +8,7 @@ #include <asm/global_data.h> #include <asm/post.h> #include <asm/arch/qemu.h> +#include <linux/sizes.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c index 19e54c5202a9..ebfe5956442a 100644 --- a/arch/x86/cpu/qemu/e820.c +++ b/arch/x86/cpu/qemu/e820.c @@ -12,6 +12,7 @@ #include <asm/e820.h> #include <asm/arch/qemu.h> #include <asm/global_data.h> +#include <linux/sizes.h>
DECLARE_GLOBAL_DATA_PTR;
Use the common include.
Drop everything from the config.h file.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/emulation/qemu-x86/qemu-x86.env | 6 ++++++ include/configs/qemu-x86.h | 23 ----------------------- 2 files changed, 6 insertions(+), 23 deletions(-) create mode 100644 board/emulation/qemu-x86/qemu-x86.env
diff --git a/board/emulation/qemu-x86/qemu-x86.env b/board/emulation/qemu-x86/qemu-x86.env new file mode 100644 index 000000000000..adcc1c53bd22 --- /dev/null +++ b/board/emulation/qemu-x86/qemu-x86.env @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com + */ + +#include <env/x86.env> diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 3e5235291a28..9b0f5cedcd79 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -2,26 +2,3 @@ /* * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */ - -/* - * board/config.h - configuration options, board specific - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -#include <linux/sizes.h> - -#include <configs/x86-common.h> - -#define CFG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ - "stdout=serial,vidconsole\0" \ - "stderr=serial,vidconsole\0" - -/* - * ATA/SATA support for QEMU x86 targets - * - Only legacy IDE controller is supported for QEMU '-M pc' target - * - AHCI controller is supported for QEMU '-M q35' target - */ - -#endif /* __CONFIG_H */
On Sun, Jul 30, 2023 at 09:01:43PM -0600, Simon Glass wrote:
This series starts the process of moving x86 boards to a text environment.
This includes conversions for about half the boards.
The rest (including the more complicated Chromebooks) can come in a later series.
Patch wise it looks good to me Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com # Intel Edison
Where can I read about this new edison.env file and what is expected to be there?
doc: Explain how to avoid the distro-boot scripts env: Use include/env for text-environment includes env: Explain how to use #include files in text environment x86: Drop CFG_SYS_STACK_SIZE x86: i8254: Include required ibmpc.h header x86: edison: Drop inclusion of ibmpc.h x86: Drop inclusion of ibmpc.h x86: Drop unused distro settings x86: Add a common include for environment settings x86: coreboot: Convert to text environment x86: crownbay: Convert to text environment x86: bayleybay: Convert to text environment x86: galileo: Convert to text environment x86: edison: Convert to text environment x86: cherryhill: Convert to text environment x86: cougarcanyon2: Convert to text environment x86: minnowmax: Convert to text environment x86: slimbootloader: Convert to text environment x86: efi-x86_app: Convert to text environment x86: efi-x86_payload: Convert to text environment x86: qemu: Add required linux/sizes.h include x86: qemu-x86: Convert to text environment
arch/x86/cpu/qemu/dram.c | 1 + arch/x86/cpu/qemu/e820.c | 1 + arch/x86/lib/i8254.c | 1 + arch/x86/lib/physmem.c | 3 +- board/coreboot/coreboot/coreboot.env | 9 +++++ board/efi/efi-x86_app/efi-x86_app.env | 6 ++++ board/efi/efi-x86_payload/efi-x86_payload.env | 6 ++++ board/emulation/qemu-x86/qemu-x86.env | 6 ++++ board/intel/bayleybay/bayleybay.env | 9 +++++ board/intel/cherryhill/cherryhill.env | 9 +++++ board/intel/cougarcanyon2/cougarcanyon2.env | 6 ++++ board/intel/crownbay/crownbay.env | 6 ++++ board/intel/edison/edison.env | 6 ++++ board/intel/galileo/galileo.env | 11 ++++++ board/intel/minnowmax/minnowmax.env | 11 ++++++ board/intel/slimbootloader/slimbootloader.env | 25 +++++++++++++ board/keymile/km83xx/km83xx.env | 4 +-- board/keymile/kmcent2/kmcent2.env | 2 +- .../keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 2 +- .../keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 2 +- board/siemens/iot2050/iot2050.env | 2 +- board/ti/am62ax/am62ax.env | 4 +-- board/ti/am62x/am62x.env | 4 +-- board/ti/am64x/am64x.env | 6 ++-- board/ti/am65x/am65x.env | 8 ++--- board/ti/j721e/j721e.env | 10 +++--- board/ti/j721s2/j721s2.env | 10 +++--- board/ti/ks2_evm/k2e_evm.env | 4 +-- board/ti/ks2_evm/k2g_evm.env | 6 ++-- board/ti/ks2_evm/k2hk_evm.env | 4 +-- board/ti/ks2_evm/k2l_evm.env | 4 +-- doc/usage/environment.rst | 8 ++++- include/configs/am335x_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/am62ax_evm.h | 4 +-- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 4 +-- include/configs/am65x_evm.h | 6 ++-- include/configs/bayleybay.h | 17 --------- include/configs/cherryhill.h | 13 ------- include/configs/coreboot.h | 20 ----------- include/configs/cougarcanyon2.h | 13 ------- include/configs/crownbay.h | 17 --------- include/configs/da850evm.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/edison.h | 11 ------ include/configs/efi-x86_app.h | 11 ------ include/configs/efi-x86_payload.h | 17 --------- include/configs/galileo.h | 19 ---------- include/configs/minnowmax.h | 16 --------- include/configs/omap3_evm.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/phycore_am335x_r2.h | 4 +-- include/configs/qemu-x86.h | 23 ------------ include/configs/sifive-unleashed.h | 2 +- include/configs/slimbootloader.h | 35 ------------------- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 4 +-- include/configs/x86-common.h | 19 ---------- include/{environment => env}/distro/sf.h | 0 .../{environment => env}/pg-wcom/common.env | 0 .../{environment => env}/pg-wcom/ls102xa.env | 2 +- .../{environment => env}/pg-wcom/powerpc.env | 0 include/{environment => env}/ti/dfu.h | 0 include/{environment => env}/ti/k3_dfu.env | 0 include/{environment => env}/ti/k3_dfu.h | 0 include/{environment => env}/ti/k3_rproc.env | 0 include/{environment => env}/ti/k3_rproc.h | 0 include/{environment => env}/ti/mmc.env | 0 include/{environment => env}/ti/mmc.h | 0 include/{environment => env}/ti/nand.env | 0 include/{environment => env}/ti/nand.h | 0 .../ti/ti_armv7_common.env | 0 .../ti/ti_armv7_keystone2.env | 0 include/{environment => env}/ti/ufs.env | 0 include/{environment => env}/ti/ufs.h | 0 include/env/x86.env | 20 +++++++++++ 78 files changed, 200 insertions(+), 291 deletions(-) create mode 100644 board/coreboot/coreboot/coreboot.env create mode 100644 board/efi/efi-x86_app/efi-x86_app.env create mode 100644 board/efi/efi-x86_payload/efi-x86_payload.env create mode 100644 board/emulation/qemu-x86/qemu-x86.env create mode 100644 board/intel/bayleybay/bayleybay.env create mode 100644 board/intel/cherryhill/cherryhill.env create mode 100644 board/intel/cougarcanyon2/cougarcanyon2.env create mode 100644 board/intel/crownbay/crownbay.env create mode 100644 board/intel/edison/edison.env create mode 100644 board/intel/galileo/galileo.env create mode 100644 board/intel/minnowmax/minnowmax.env create mode 100644 board/intel/slimbootloader/slimbootloader.env rename include/{environment => env}/distro/sf.h (100%) rename include/{environment => env}/pg-wcom/common.env (100%) rename include/{environment => env}/pg-wcom/ls102xa.env (95%) rename include/{environment => env}/pg-wcom/powerpc.env (100%) rename include/{environment => env}/ti/dfu.h (100%) rename include/{environment => env}/ti/k3_dfu.env (100%) rename include/{environment => env}/ti/k3_dfu.h (100%) rename include/{environment => env}/ti/k3_rproc.env (100%) rename include/{environment => env}/ti/k3_rproc.h (100%) rename include/{environment => env}/ti/mmc.env (100%) rename include/{environment => env}/ti/mmc.h (100%) rename include/{environment => env}/ti/nand.env (100%) rename include/{environment => env}/ti/nand.h (100%) rename include/{environment => env}/ti/ti_armv7_common.env (100%) rename include/{environment => env}/ti/ti_armv7_keystone2.env (100%) rename include/{environment => env}/ti/ufs.env (100%) rename include/{environment => env}/ti/ufs.h (100%) create mode 100644 include/env/x86.env
-- 2.41.0.487.g6d72f3e995-goog
Hi Andy,
On Mon, 31 Jul 2023 at 02:09, Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
On Sun, Jul 30, 2023 at 09:01:43PM -0600, Simon Glass wrote:
This series starts the process of moving x86 boards to a text environment.
This includes conversions for about half the boards.
The rest (including the more complicated Chromebooks) can come in a later series.
Patch wise it looks good to me Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com # Intel Edison
Where can I read about this new edison.env file and what is expected to be there?
Thanks. It is here:
https://u-boot.readthedocs.io/en/latest/usage/environment.html#text-based-en...
[..]
Regards, Simon
On Mon, Jul 31, 2023 at 4:12 PM Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
On Sun, Jul 30, 2023 at 09:01:43PM -0600, Simon Glass wrote:
This series starts the process of moving x86 boards to a text environment.
This includes conversions for about half the boards.
The rest (including the more complicated Chromebooks) can come in a later series.
Patch wise it looks good to me Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com # Intel Edison
Series LGTM too.
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Where can I read about this new edison.env file and what is expected to be there?
Regards, Bin
On Thu, Aug 3, 2023 at 7:27 PM Bin Meng bmeng.cn@gmail.com wrote:
On Mon, Jul 31, 2023 at 4:12 PM Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
On Sun, Jul 30, 2023 at 09:01:43PM -0600, Simon Glass wrote:
This series starts the process of moving x86 boards to a text environment.
This includes conversions for about half the boards.
The rest (including the more complicated Chromebooks) can come in a later series.
Patch wise it looks good to me Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com # Intel Edison
Series LGTM too.
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Edited "[18/22] x86: slimbootloader: Convert to text environment ",
series applied to u-boot-x86, thanks!
I'm not x86 maintainer, and I'm not going to review changes. So please do not send me these emails. I have expressed it many times.
On Sunday 30 July 2023 21:01:43 Simon Glass wrote:
This series starts the process of moving x86 boards to a text environment.
This includes conversions for about half the boards.
The rest (including the more complicated Chromebooks) can come in a later series.
Simon Glass (22): doc: Explain how to avoid the distro-boot scripts env: Use include/env for text-environment includes env: Explain how to use #include files in text environment x86: Drop CFG_SYS_STACK_SIZE x86: i8254: Include required ibmpc.h header x86: edison: Drop inclusion of ibmpc.h x86: Drop inclusion of ibmpc.h x86: Drop unused distro settings x86: Add a common include for environment settings x86: coreboot: Convert to text environment x86: crownbay: Convert to text environment x86: bayleybay: Convert to text environment x86: galileo: Convert to text environment x86: edison: Convert to text environment x86: cherryhill: Convert to text environment x86: cougarcanyon2: Convert to text environment x86: minnowmax: Convert to text environment x86: slimbootloader: Convert to text environment x86: efi-x86_app: Convert to text environment x86: efi-x86_payload: Convert to text environment x86: qemu: Add required linux/sizes.h include x86: qemu-x86: Convert to text environment
arch/x86/cpu/qemu/dram.c | 1 + arch/x86/cpu/qemu/e820.c | 1 + arch/x86/lib/i8254.c | 1 + arch/x86/lib/physmem.c | 3 +- board/coreboot/coreboot/coreboot.env | 9 +++++ board/efi/efi-x86_app/efi-x86_app.env | 6 ++++ board/efi/efi-x86_payload/efi-x86_payload.env | 6 ++++ board/emulation/qemu-x86/qemu-x86.env | 6 ++++ board/intel/bayleybay/bayleybay.env | 9 +++++ board/intel/cherryhill/cherryhill.env | 9 +++++ board/intel/cougarcanyon2/cougarcanyon2.env | 6 ++++ board/intel/crownbay/crownbay.env | 6 ++++ board/intel/edison/edison.env | 6 ++++ board/intel/galileo/galileo.env | 11 ++++++ board/intel/minnowmax/minnowmax.env | 11 ++++++ board/intel/slimbootloader/slimbootloader.env | 25 +++++++++++++ board/keymile/km83xx/km83xx.env | 4 +-- board/keymile/kmcent2/kmcent2.env | 2 +- .../keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 2 +- .../keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 2 +- board/siemens/iot2050/iot2050.env | 2 +- board/ti/am62ax/am62ax.env | 4 +-- board/ti/am62x/am62x.env | 4 +-- board/ti/am64x/am64x.env | 6 ++-- board/ti/am65x/am65x.env | 8 ++--- board/ti/j721e/j721e.env | 10 +++--- board/ti/j721s2/j721s2.env | 10 +++--- board/ti/ks2_evm/k2e_evm.env | 4 +-- board/ti/ks2_evm/k2g_evm.env | 6 ++-- board/ti/ks2_evm/k2hk_evm.env | 4 +-- board/ti/ks2_evm/k2l_evm.env | 4 +-- doc/usage/environment.rst | 8 ++++- include/configs/am335x_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/am62ax_evm.h | 4 +-- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 4 +-- include/configs/am65x_evm.h | 6 ++-- include/configs/bayleybay.h | 17 --------- include/configs/cherryhill.h | 13 ------- include/configs/coreboot.h | 20 ----------- include/configs/cougarcanyon2.h | 13 ------- include/configs/crownbay.h | 17 --------- include/configs/da850evm.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/edison.h | 11 ------ include/configs/efi-x86_app.h | 11 ------ include/configs/efi-x86_payload.h | 17 --------- include/configs/galileo.h | 19 ---------- include/configs/minnowmax.h | 16 --------- include/configs/omap3_evm.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/phycore_am335x_r2.h | 4 +-- include/configs/qemu-x86.h | 23 ------------ include/configs/sifive-unleashed.h | 2 +- include/configs/slimbootloader.h | 35 ------------------- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 4 +-- include/configs/x86-common.h | 19 ---------- include/{environment => env}/distro/sf.h | 0 .../{environment => env}/pg-wcom/common.env | 0 .../{environment => env}/pg-wcom/ls102xa.env | 2 +- .../{environment => env}/pg-wcom/powerpc.env | 0 include/{environment => env}/ti/dfu.h | 0 include/{environment => env}/ti/k3_dfu.env | 0 include/{environment => env}/ti/k3_dfu.h | 0 include/{environment => env}/ti/k3_rproc.env | 0 include/{environment => env}/ti/k3_rproc.h | 0 include/{environment => env}/ti/mmc.env | 0 include/{environment => env}/ti/mmc.h | 0 include/{environment => env}/ti/nand.env | 0 include/{environment => env}/ti/nand.h | 0 .../ti/ti_armv7_common.env | 0 .../ti/ti_armv7_keystone2.env | 0 include/{environment => env}/ti/ufs.env | 0 include/{environment => env}/ti/ufs.h | 0 include/env/x86.env | 20 +++++++++++ 78 files changed, 200 insertions(+), 291 deletions(-) create mode 100644 board/coreboot/coreboot/coreboot.env create mode 100644 board/efi/efi-x86_app/efi-x86_app.env create mode 100644 board/efi/efi-x86_payload/efi-x86_payload.env create mode 100644 board/emulation/qemu-x86/qemu-x86.env create mode 100644 board/intel/bayleybay/bayleybay.env create mode 100644 board/intel/cherryhill/cherryhill.env create mode 100644 board/intel/cougarcanyon2/cougarcanyon2.env create mode 100644 board/intel/crownbay/crownbay.env create mode 100644 board/intel/edison/edison.env create mode 100644 board/intel/galileo/galileo.env create mode 100644 board/intel/minnowmax/minnowmax.env create mode 100644 board/intel/slimbootloader/slimbootloader.env rename include/{environment => env}/distro/sf.h (100%) rename include/{environment => env}/pg-wcom/common.env (100%) rename include/{environment => env}/pg-wcom/ls102xa.env (95%) rename include/{environment => env}/pg-wcom/powerpc.env (100%) rename include/{environment => env}/ti/dfu.h (100%) rename include/{environment => env}/ti/k3_dfu.env (100%) rename include/{environment => env}/ti/k3_dfu.h (100%) rename include/{environment => env}/ti/k3_rproc.env (100%) rename include/{environment => env}/ti/k3_rproc.h (100%) rename include/{environment => env}/ti/mmc.env (100%) rename include/{environment => env}/ti/mmc.h (100%) rename include/{environment => env}/ti/nand.env (100%) rename include/{environment => env}/ti/nand.h (100%) rename include/{environment => env}/ti/ti_armv7_common.env (100%) rename include/{environment => env}/ti/ti_armv7_keystone2.env (100%) rename include/{environment => env}/ti/ufs.env (100%) rename include/{environment => env}/ti/ufs.h (100%) create mode 100644 include/env/x86.env
-- 2.41.0.487.g6d72f3e995-goog
Hi Pali,
On Sun, 6 Aug 2023 at 04:51, Pali Rohár pali@kernel.org wrote:
I'm not x86 maintainer, and I'm not going to review changes. So please do not send me these emails. I have expressed it many times.
You were sent one patch (and the cover letter) because you are the second committer on arch/x86/cpu/qemu/dram.c
On Sunday 30 July 2023 21:01:43 Simon Glass wrote:
This series starts the process of moving x86 boards to a text environment.
This includes conversions for about half the boards.
The rest (including the more complicated Chromebooks) can come in a later series.
Simon Glass (22): doc: Explain how to avoid the distro-boot scripts env: Use include/env for text-environment includes env: Explain how to use #include files in text environment x86: Drop CFG_SYS_STACK_SIZE x86: i8254: Include required ibmpc.h header x86: edison: Drop inclusion of ibmpc.h x86: Drop inclusion of ibmpc.h x86: Drop unused distro settings x86: Add a common include for environment settings x86: coreboot: Convert to text environment x86: crownbay: Convert to text environment x86: bayleybay: Convert to text environment x86: galileo: Convert to text environment x86: edison: Convert to text environment x86: cherryhill: Convert to text environment x86: cougarcanyon2: Convert to text environment x86: minnowmax: Convert to text environment x86: slimbootloader: Convert to text environment x86: efi-x86_app: Convert to text environment x86: efi-x86_payload: Convert to text environment x86: qemu: Add required linux/sizes.h include x86: qemu-x86: Convert to text environment
arch/x86/cpu/qemu/dram.c | 1 + arch/x86/cpu/qemu/e820.c | 1 + arch/x86/lib/i8254.c | 1 + arch/x86/lib/physmem.c | 3 +- board/coreboot/coreboot/coreboot.env | 9 +++++ board/efi/efi-x86_app/efi-x86_app.env | 6 ++++ board/efi/efi-x86_payload/efi-x86_payload.env | 6 ++++ board/emulation/qemu-x86/qemu-x86.env | 6 ++++ board/intel/bayleybay/bayleybay.env | 9 +++++ board/intel/cherryhill/cherryhill.env | 9 +++++ board/intel/cougarcanyon2/cougarcanyon2.env | 6 ++++ board/intel/crownbay/crownbay.env | 6 ++++ board/intel/edison/edison.env | 6 ++++ board/intel/galileo/galileo.env | 11 ++++++ board/intel/minnowmax/minnowmax.env | 11 ++++++ board/intel/slimbootloader/slimbootloader.env | 25 +++++++++++++ board/keymile/km83xx/km83xx.env | 4 +-- board/keymile/kmcent2/kmcent2.env | 2 +- .../keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 2 +- .../keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 2 +- board/siemens/iot2050/iot2050.env | 2 +- board/ti/am62ax/am62ax.env | 4 +-- board/ti/am62x/am62x.env | 4 +-- board/ti/am64x/am64x.env | 6 ++-- board/ti/am65x/am65x.env | 8 ++--- board/ti/j721e/j721e.env | 10 +++--- board/ti/j721s2/j721s2.env | 10 +++--- board/ti/ks2_evm/k2e_evm.env | 4 +-- board/ti/ks2_evm/k2g_evm.env | 6 ++-- board/ti/ks2_evm/k2hk_evm.env | 4 +-- board/ti/ks2_evm/k2l_evm.env | 4 +-- doc/usage/environment.rst | 8 ++++- include/configs/am335x_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/am62ax_evm.h | 4 +-- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 4 +-- include/configs/am65x_evm.h | 6 ++-- include/configs/bayleybay.h | 17 --------- include/configs/cherryhill.h | 13 ------- include/configs/coreboot.h | 20 ----------- include/configs/cougarcanyon2.h | 13 ------- include/configs/crownbay.h | 17 --------- include/configs/da850evm.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/edison.h | 11 ------ include/configs/efi-x86_app.h | 11 ------ include/configs/efi-x86_payload.h | 17 --------- include/configs/galileo.h | 19 ---------- include/configs/minnowmax.h | 16 --------- include/configs/omap3_evm.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/phycore_am335x_r2.h | 4 +-- include/configs/qemu-x86.h | 23 ------------ include/configs/sifive-unleashed.h | 2 +- include/configs/slimbootloader.h | 35 ------------------- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 4 +-- include/configs/x86-common.h | 19 ---------- include/{environment => env}/distro/sf.h | 0 .../{environment => env}/pg-wcom/common.env | 0 .../{environment => env}/pg-wcom/ls102xa.env | 2 +- .../{environment => env}/pg-wcom/powerpc.env | 0 include/{environment => env}/ti/dfu.h | 0 include/{environment => env}/ti/k3_dfu.env | 0 include/{environment => env}/ti/k3_dfu.h | 0 include/{environment => env}/ti/k3_rproc.env | 0 include/{environment => env}/ti/k3_rproc.h | 0 include/{environment => env}/ti/mmc.env | 0 include/{environment => env}/ti/mmc.h | 0 include/{environment => env}/ti/nand.env | 0 include/{environment => env}/ti/nand.h | 0 .../ti/ti_armv7_common.env | 0 .../ti/ti_armv7_keystone2.env | 0 include/{environment => env}/ti/ufs.env | 0 include/{environment => env}/ti/ufs.h | 0 include/env/x86.env | 20 +++++++++++ 78 files changed, 200 insertions(+), 291 deletions(-) create mode 100644 board/coreboot/coreboot/coreboot.env create mode 100644 board/efi/efi-x86_app/efi-x86_app.env create mode 100644 board/efi/efi-x86_payload/efi-x86_payload.env create mode 100644 board/emulation/qemu-x86/qemu-x86.env create mode 100644 board/intel/bayleybay/bayleybay.env create mode 100644 board/intel/cherryhill/cherryhill.env create mode 100644 board/intel/cougarcanyon2/cougarcanyon2.env create mode 100644 board/intel/crownbay/crownbay.env create mode 100644 board/intel/edison/edison.env create mode 100644 board/intel/galileo/galileo.env create mode 100644 board/intel/minnowmax/minnowmax.env create mode 100644 board/intel/slimbootloader/slimbootloader.env rename include/{environment => env}/distro/sf.h (100%) rename include/{environment => env}/pg-wcom/common.env (100%) rename include/{environment => env}/pg-wcom/ls102xa.env (95%) rename include/{environment => env}/pg-wcom/powerpc.env (100%) rename include/{environment => env}/ti/dfu.h (100%) rename include/{environment => env}/ti/k3_dfu.env (100%) rename include/{environment => env}/ti/k3_dfu.h (100%) rename include/{environment => env}/ti/k3_rproc.env (100%) rename include/{environment => env}/ti/k3_rproc.h (100%) rename include/{environment => env}/ti/mmc.env (100%) rename include/{environment => env}/ti/mmc.h (100%) rename include/{environment => env}/ti/nand.env (100%) rename include/{environment => env}/ti/nand.h (100%) rename include/{environment => env}/ti/ti_armv7_common.env (100%) rename include/{environment => env}/ti/ti_armv7_keystone2.env (100%) rename include/{environment => env}/ti/ufs.env (100%) rename include/{environment => env}/ti/ufs.h (100%) create mode 100644 include/env/x86.env
-- 2.41.0.487.g6d72f3e995-goog
Regards, Simon
On Sunday 06 August 2023 08:39:43 Simon Glass wrote:
Hi Pali,
On Sun, 6 Aug 2023 at 04:51, Pali Rohár pali@kernel.org wrote:
I'm not x86 maintainer, and I'm not going to review changes. So please do not send me these emails. I have expressed it many times.
You were sent one patch (and the cover letter) because you are the second committer on arch/x86/cpu/qemu/dram.c
I'm not maintainer of arch/x86/cpu/qemu/dram.c. How many times I have to repeat it? You do not understand? Or what you are trying to do now?
On Sunday 30 July 2023 21:01:43 Simon Glass wrote:
This series starts the process of moving x86 boards to a text environment.
This includes conversions for about half the boards.
The rest (including the more complicated Chromebooks) can come in a later series.
Simon Glass (22): doc: Explain how to avoid the distro-boot scripts env: Use include/env for text-environment includes env: Explain how to use #include files in text environment x86: Drop CFG_SYS_STACK_SIZE x86: i8254: Include required ibmpc.h header x86: edison: Drop inclusion of ibmpc.h x86: Drop inclusion of ibmpc.h x86: Drop unused distro settings x86: Add a common include for environment settings x86: coreboot: Convert to text environment x86: crownbay: Convert to text environment x86: bayleybay: Convert to text environment x86: galileo: Convert to text environment x86: edison: Convert to text environment x86: cherryhill: Convert to text environment x86: cougarcanyon2: Convert to text environment x86: minnowmax: Convert to text environment x86: slimbootloader: Convert to text environment x86: efi-x86_app: Convert to text environment x86: efi-x86_payload: Convert to text environment x86: qemu: Add required linux/sizes.h include x86: qemu-x86: Convert to text environment
arch/x86/cpu/qemu/dram.c | 1 + arch/x86/cpu/qemu/e820.c | 1 + arch/x86/lib/i8254.c | 1 + arch/x86/lib/physmem.c | 3 +- board/coreboot/coreboot/coreboot.env | 9 +++++ board/efi/efi-x86_app/efi-x86_app.env | 6 ++++ board/efi/efi-x86_payload/efi-x86_payload.env | 6 ++++ board/emulation/qemu-x86/qemu-x86.env | 6 ++++ board/intel/bayleybay/bayleybay.env | 9 +++++ board/intel/cherryhill/cherryhill.env | 9 +++++ board/intel/cougarcanyon2/cougarcanyon2.env | 6 ++++ board/intel/crownbay/crownbay.env | 6 ++++ board/intel/edison/edison.env | 6 ++++ board/intel/galileo/galileo.env | 11 ++++++ board/intel/minnowmax/minnowmax.env | 11 ++++++ board/intel/slimbootloader/slimbootloader.env | 25 +++++++++++++ board/keymile/km83xx/km83xx.env | 4 +-- board/keymile/kmcent2/kmcent2.env | 2 +- .../keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 2 +- .../keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 2 +- board/siemens/iot2050/iot2050.env | 2 +- board/ti/am62ax/am62ax.env | 4 +-- board/ti/am62x/am62x.env | 4 +-- board/ti/am64x/am64x.env | 6 ++-- board/ti/am65x/am65x.env | 8 ++--- board/ti/j721e/j721e.env | 10 +++--- board/ti/j721s2/j721s2.env | 10 +++--- board/ti/ks2_evm/k2e_evm.env | 4 +-- board/ti/ks2_evm/k2g_evm.env | 6 ++-- board/ti/ks2_evm/k2hk_evm.env | 4 +-- board/ti/ks2_evm/k2l_evm.env | 4 +-- doc/usage/environment.rst | 8 ++++- include/configs/am335x_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/am62ax_evm.h | 4 +-- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 4 +-- include/configs/am65x_evm.h | 6 ++-- include/configs/bayleybay.h | 17 --------- include/configs/cherryhill.h | 13 ------- include/configs/coreboot.h | 20 ----------- include/configs/cougarcanyon2.h | 13 ------- include/configs/crownbay.h | 17 --------- include/configs/da850evm.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/edison.h | 11 ------ include/configs/efi-x86_app.h | 11 ------ include/configs/efi-x86_payload.h | 17 --------- include/configs/galileo.h | 19 ---------- include/configs/minnowmax.h | 16 --------- include/configs/omap3_evm.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/phycore_am335x_r2.h | 4 +-- include/configs/qemu-x86.h | 23 ------------ include/configs/sifive-unleashed.h | 2 +- include/configs/slimbootloader.h | 35 ------------------- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 4 +-- include/configs/x86-common.h | 19 ---------- include/{environment => env}/distro/sf.h | 0 .../{environment => env}/pg-wcom/common.env | 0 .../{environment => env}/pg-wcom/ls102xa.env | 2 +- .../{environment => env}/pg-wcom/powerpc.env | 0 include/{environment => env}/ti/dfu.h | 0 include/{environment => env}/ti/k3_dfu.env | 0 include/{environment => env}/ti/k3_dfu.h | 0 include/{environment => env}/ti/k3_rproc.env | 0 include/{environment => env}/ti/k3_rproc.h | 0 include/{environment => env}/ti/mmc.env | 0 include/{environment => env}/ti/mmc.h | 0 include/{environment => env}/ti/nand.env | 0 include/{environment => env}/ti/nand.h | 0 .../ti/ti_armv7_common.env | 0 .../ti/ti_armv7_keystone2.env | 0 include/{environment => env}/ti/ufs.env | 0 include/{environment => env}/ti/ufs.h | 0 include/env/x86.env | 20 +++++++++++ 78 files changed, 200 insertions(+), 291 deletions(-) create mode 100644 board/coreboot/coreboot/coreboot.env create mode 100644 board/efi/efi-x86_app/efi-x86_app.env create mode 100644 board/efi/efi-x86_payload/efi-x86_payload.env create mode 100644 board/emulation/qemu-x86/qemu-x86.env create mode 100644 board/intel/bayleybay/bayleybay.env create mode 100644 board/intel/cherryhill/cherryhill.env create mode 100644 board/intel/cougarcanyon2/cougarcanyon2.env create mode 100644 board/intel/crownbay/crownbay.env create mode 100644 board/intel/edison/edison.env create mode 100644 board/intel/galileo/galileo.env create mode 100644 board/intel/minnowmax/minnowmax.env create mode 100644 board/intel/slimbootloader/slimbootloader.env rename include/{environment => env}/distro/sf.h (100%) rename include/{environment => env}/pg-wcom/common.env (100%) rename include/{environment => env}/pg-wcom/ls102xa.env (95%) rename include/{environment => env}/pg-wcom/powerpc.env (100%) rename include/{environment => env}/ti/dfu.h (100%) rename include/{environment => env}/ti/k3_dfu.env (100%) rename include/{environment => env}/ti/k3_dfu.h (100%) rename include/{environment => env}/ti/k3_rproc.env (100%) rename include/{environment => env}/ti/k3_rproc.h (100%) rename include/{environment => env}/ti/mmc.env (100%) rename include/{environment => env}/ti/mmc.h (100%) rename include/{environment => env}/ti/nand.env (100%) rename include/{environment => env}/ti/nand.h (100%) rename include/{environment => env}/ti/ti_armv7_common.env (100%) rename include/{environment => env}/ti/ti_armv7_keystone2.env (100%) rename include/{environment => env}/ti/ufs.env (100%) rename include/{environment => env}/ti/ufs.h (100%) create mode 100644 include/env/x86.env
-- 2.41.0.487.g6d72f3e995-goog
Regards, Simon
Hi Pali,
On Sun, Aug 6, 2023 at 11:55 PM Pali Rohár pali@kernel.org wrote:
On Sunday 06 August 2023 08:39:43 Simon Glass wrote:
Hi Pali,
On Sun, 6 Aug 2023 at 04:51, Pali Rohár pali@kernel.org wrote:
I'm not x86 maintainer, and I'm not going to review changes. So please do not send me these emails. I have expressed it many times.
You were sent one patch (and the cover letter) because you are the second committer on arch/x86/cpu/qemu/dram.c
I'm not maintainer of arch/x86/cpu/qemu/dram.c. How many times I have to repeat it? You do not understand? Or what you are trying to do now?
I believe this cc list comes from patman which calls get_maintainer.pl to get the cc list. get_maintainer.pl determines the person names from 1. MAINTAINERS of the changed file 2. git commit history of the changed file.
I can see the philosophy was that someone who touched the changed file should be copied for review. We certainly could argue that and just get the list solely from the MAINTAINERS file.
Regards, Bin
So remove me from that list of dram.c file. I'm not interested to receive emails from people who are ignoring me about unrelated things.
On Monday 07 August 2023 09:43:01 Bin Meng wrote:
Hi Pali,
On Sun, Aug 6, 2023 at 11:55 PM Pali Rohár pali@kernel.org wrote:
On Sunday 06 August 2023 08:39:43 Simon Glass wrote:
Hi Pali,
On Sun, 6 Aug 2023 at 04:51, Pali Rohár pali@kernel.org wrote:
I'm not x86 maintainer, and I'm not going to review changes. So please do not send me these emails. I have expressed it many times.
You were sent one patch (and the cover letter) because you are the second committer on arch/x86/cpu/qemu/dram.c
I'm not maintainer of arch/x86/cpu/qemu/dram.c. How many times I have to repeat it? You do not understand? Or what you are trying to do now?
I believe this cc list comes from patman which calls get_maintainer.pl to get the cc list. get_maintainer.pl determines the person names from 1. MAINTAINERS of the changed file 2. git commit history of the changed file.
I can see the philosophy was that someone who touched the changed file should be copied for review. We certainly could argue that and just get the list solely from the MAINTAINERS file.
Regards, Bin
Hi Pali
Can you just filter emails on your side?
Michael
On Mon, Aug 7, 2023 at 2:18 PM Pali Rohár pali@kernel.org wrote:
So remove me from that list of dram.c file. I'm not interested to receive emails from people who are ignoring me about unrelated things.
On Monday 07 August 2023 09:43:01 Bin Meng wrote:
Hi Pali,
On Sun, Aug 6, 2023 at 11:55 PM Pali Rohár pali@kernel.org wrote:
On Sunday 06 August 2023 08:39:43 Simon Glass wrote:
Hi Pali,
On Sun, 6 Aug 2023 at 04:51, Pali Rohár pali@kernel.org wrote:
I'm not x86 maintainer, and I'm not going to review changes. So please do not send me these emails. I have expressed it many times.
You were sent one patch (and the cover letter) because you are the second committer on arch/x86/cpu/qemu/dram.c
I'm not maintainer of arch/x86/cpu/qemu/dram.c. How many times I have to repeat it? You do not understand? Or what you are trying to do now?
I believe this cc list comes from patman which calls get_maintainer.pl to get the cc list. get_maintainer.pl determines the person names from 1. MAINTAINERS of the changed file 2. git commit history of the changed file.
I can see the philosophy was that someone who touched the changed file should be copied for review. We certainly could argue that and just get the list solely from the MAINTAINERS file.
Regards, Bin
On Mon, Aug 07, 2023 at 02:44:31PM +0200, Michael Nazzareno Trimarchi wrote:
Hi Pali
Can you just filter emails on your side?
Independently on the question is default setup is good or not (from _this_ point of view, I *disagree* with Pali), we have to have a possibility to filter on _our_ side the email addresses to make people happy. If Pali by some reasons does not want to see, it must be easy to keep some deny list in the repository.
What you are suggesting is not polite I believe.
On Mon, Aug 7, 2023 at 2:18 PM Pali Rohár pali@kernel.org wrote:
So remove me from that list of dram.c file. I'm not interested to receive emails from people who are ignoring me about unrelated things.
On Monday 07 August 2023 09:43:01 Bin Meng wrote:
Hi Pali,
On Sun, Aug 6, 2023 at 11:55 PM Pali Rohár pali@kernel.org wrote:
On Sunday 06 August 2023 08:39:43 Simon Glass wrote:
Hi Pali,
On Sun, 6 Aug 2023 at 04:51, Pali Rohár pali@kernel.org wrote:
I'm not x86 maintainer, and I'm not going to review changes. So please do not send me these emails. I have expressed it many times.
You were sent one patch (and the cover letter) because you are the second committer on arch/x86/cpu/qemu/dram.c
I'm not maintainer of arch/x86/cpu/qemu/dram.c. How many times I have to repeat it? You do not understand? Or what you are trying to do now?
I believe this cc list comes from patman which calls get_maintainer.pl to get the cc list. get_maintainer.pl determines the person names from 1. MAINTAINERS of the changed file 2. git commit history of the changed file.
I can see the philosophy was that someone who touched the changed file should be copied for review. We certainly could argue that and just get the list solely from the MAINTAINERS file.
Regards, Bin
-- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael@amarulasolutions.com __________________________________
Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info@amarulasolutions.com www.amarulasolutions.com
On Mon, Aug 07, 2023 at 04:03:45PM +0300, Andy Shevchenko wrote:
On Mon, Aug 07, 2023 at 02:44:31PM +0200, Michael Nazzareno Trimarchi wrote:
Hi Pali
Can you just filter emails on your side?
Independently on the question is default setup is good or not (from _this_ point of view, I *disagree* with Pali), we have to have a possibility to filter on _our_ side the email addresses to make people happy. If Pali by some reasons does not want to see, it must be easy to keep some deny list in the repository.
What you are suggesting is not polite I believe.
I have to admit I didn't notice ".get_maintainer.ignore" until now. So yes, it sounds like we can do that too.
On Mon, Aug 7, 2023 at 2:18 PM Pali Rohár pali@kernel.org wrote:
So remove me from that list of dram.c file. I'm not interested to receive emails from people who are ignoring me about unrelated things.
On Monday 07 August 2023 09:43:01 Bin Meng wrote:
Hi Pali,
On Sun, Aug 6, 2023 at 11:55 PM Pali Rohár pali@kernel.org wrote:
On Sunday 06 August 2023 08:39:43 Simon Glass wrote:
Hi Pali,
On Sun, 6 Aug 2023 at 04:51, Pali Rohár pali@kernel.org wrote: > > I'm not x86 maintainer, and I'm not going to review changes. So please > do not send me these emails. I have expressed it many times.
You were sent one patch (and the cover letter) because you are the second committer on arch/x86/cpu/qemu/dram.c
I'm not maintainer of arch/x86/cpu/qemu/dram.c. How many times I have to repeat it? You do not understand? Or what you are trying to do now?
I believe this cc list comes from patman which calls get_maintainer.pl to get the cc list. get_maintainer.pl determines the person names from 1. MAINTAINERS of the changed file 2. git commit history of the changed file.
I can see the philosophy was that someone who touched the changed file should be copied for review. We certainly could argue that and just get the list solely from the MAINTAINERS file.
Regards, Bin
-- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael@amarulasolutions.com __________________________________
Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info@amarulasolutions.com www.amarulasolutions.com
-- With Best Regards, Andy Shevchenko
Hi Andy
On Mon, Aug 7, 2023 at 3:04 PM Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
On Mon, Aug 07, 2023 at 02:44:31PM +0200, Michael Nazzareno Trimarchi wrote:
Hi Pali
Can you just filter emails on your side?
Independently on the question is default setup is good or not (from _this_ point of view, I *disagree* with Pali), we have to have a possibility to filter on _our_ side the email addresses to make people happy. If Pali by some reasons does not want to see, it must be easy to keep some deny list in the repository.
What you are suggesting is not polite I believe.
I understand what you mean, I never consider emails to me as a problem if I'm working on an opensource project and mostly of the time I'm happy to receive them
Michael
On Mon, Aug 7, 2023 at 2:18 PM Pali Rohár pali@kernel.org wrote:
So remove me from that list of dram.c file. I'm not interested to receive emails from people who are ignoring me about unrelated things.
On Monday 07 August 2023 09:43:01 Bin Meng wrote:
Hi Pali,
On Sun, Aug 6, 2023 at 11:55 PM Pali Rohár pali@kernel.org wrote:
On Sunday 06 August 2023 08:39:43 Simon Glass wrote:
Hi Pali,
On Sun, 6 Aug 2023 at 04:51, Pali Rohár pali@kernel.org wrote: > > I'm not x86 maintainer, and I'm not going to review changes. So please > do not send me these emails. I have expressed it many times.
You were sent one patch (and the cover letter) because you are the second committer on arch/x86/cpu/qemu/dram.c
I'm not maintainer of arch/x86/cpu/qemu/dram.c. How many times I have to repeat it? You do not understand? Or what you are trying to do now?
I believe this cc list comes from patman which calls get_maintainer.pl to get the cc list. get_maintainer.pl determines the person names from 1. MAINTAINERS of the changed file 2. git commit history of the changed file.
I can see the philosophy was that someone who touched the changed file should be copied for review. We certainly could argue that and just get the list solely from the MAINTAINERS file.
Regards, Bin
-- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael@amarulasolutions.com __________________________________
Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info@amarulasolutions.com www.amarulasolutions.com
-- With Best Regards, Andy Shevchenko
On Mon, Aug 07, 2023 at 03:30:25PM +0200, Michael Nazzareno Trimarchi wrote:
On Mon, Aug 7, 2023 at 3:04 PM Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
On Mon, Aug 07, 2023 at 02:44:31PM +0200, Michael Nazzareno Trimarchi wrote:
Hi Pali
Can you just filter emails on your side?
Independently on the question is default setup is good or not (from _this_ point of view, I *disagree* with Pali), we have to have a possibility to filter on _our_ side the email addresses to make people happy. If Pali by some reasons does not want to see, it must be easy to keep some deny list in the repository.
What you are suggesting is not polite I believe.
I understand what you mean, I never consider emails to me as a problem if I'm working on an opensource project and mostly of the time I'm happy to receive them
It really depends. I agree with Bin on that, but we should respect someone's wishes (in case it's done automatically by heuristics [git history] rather than letter of law [MAINTAINERS database]).
On Mon, Aug 7, 2023 at 2:18 PM Pali Rohár pali@kernel.org wrote:
So remove me from that list of dram.c file. I'm not interested to receive emails from people who are ignoring me about unrelated things.
On Monday 07 August 2023 09:43:01 Bin Meng wrote:
Hi Pali,
On Sun, Aug 6, 2023 at 11:55 PM Pali Rohár pali@kernel.org wrote:
On Sunday 06 August 2023 08:39:43 Simon Glass wrote: > Hi Pali, > > On Sun, 6 Aug 2023 at 04:51, Pali Rohár pali@kernel.org wrote: > > > > I'm not x86 maintainer, and I'm not going to review changes. So please > > do not send me these emails. I have expressed it many times. > > You were sent one patch (and the cover letter) because you are the > second committer on arch/x86/cpu/qemu/dram.c
I'm not maintainer of arch/x86/cpu/qemu/dram.c. How many times I have to repeat it? You do not understand? Or what you are trying to do now?
I believe this cc list comes from patman which calls get_maintainer.pl to get the cc list. get_maintainer.pl determines the person names from 1. MAINTAINERS of the changed file 2. git commit history of the changed file.
I can see the philosophy was that someone who touched the changed file should be copied for review. We certainly could argue that and just get the list solely from the MAINTAINERS file.
On Monday 07 August 2023 15:30:25 Michael Nazzareno Trimarchi wrote:
Hi Andy
On Mon, Aug 7, 2023 at 3:04 PM Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
On Mon, Aug 07, 2023 at 02:44:31PM +0200, Michael Nazzareno Trimarchi wrote:
Hi Pali
Can you just filter emails on your side?
Independently on the question is default setup is good or not (from _this_ point of view, I *disagree* with Pali), we have to have a possibility to filter on _our_ side the email addresses to make people happy. If Pali by some reasons does not want to see, it must be easy to keep some deny list in the repository.
What you are suggesting is not polite I believe.
I understand what you mean, I never consider emails to me as a problem if I'm working on an opensource project and mostly of the time I'm happy to receive them
No, I'm really not happy to receive emails from people who either implicity or explicitly said that will ignore all my contributions there and trying to convince me to go away and at the same time they want from me to do review on their own changes in my free time. I was patient, I wait one year to see if something happen - but absolutely nothing.
So why you cannot understand that if you are not interested in my patches, then I'm obviously not interested in yours? Or you are continuing trying to say that I'm idiot who should do exactly what you wrote? No! You would have to find another fool who would follow these your ideas.
Michael
On Mon, Aug 7, 2023 at 2:18 PM Pali Rohár pali@kernel.org wrote:
So remove me from that list of dram.c file. I'm not interested to receive emails from people who are ignoring me about unrelated things.
On Monday 07 August 2023 09:43:01 Bin Meng wrote:
Hi Pali,
On Sun, Aug 6, 2023 at 11:55 PM Pali Rohár pali@kernel.org wrote:
On Sunday 06 August 2023 08:39:43 Simon Glass wrote: > Hi Pali, > > On Sun, 6 Aug 2023 at 04:51, Pali Rohár pali@kernel.org wrote: > > > > I'm not x86 maintainer, and I'm not going to review changes. So please > > do not send me these emails. I have expressed it many times. > > You were sent one patch (and the cover letter) because you are the > second committer on arch/x86/cpu/qemu/dram.c
I'm not maintainer of arch/x86/cpu/qemu/dram.c. How many times I have to repeat it? You do not understand? Or what you are trying to do now?
I believe this cc list comes from patman which calls get_maintainer.pl to get the cc list. get_maintainer.pl determines the person names from 1. MAINTAINERS of the changed file 2. git commit history of the changed file.
I can see the philosophy was that someone who touched the changed file should be copied for review. We certainly could argue that and just get the list solely from the MAINTAINERS file.
Regards, Bin
-- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael@amarulasolutions.com __________________________________
Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info@amarulasolutions.com www.amarulasolutions.com
-- With Best Regards, Andy Shevchenko
-- Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael@amarulasolutions.com __________________________________
Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info@amarulasolutions.com www.amarulasolutions.com
participants (6)
-
Andy Shevchenko -
Bin Meng -
Michael Nazzareno Trimarchi -
Pali Rohár -
Simon Glass -
Tom Rini