On Mon, Jul 31, 2023 at 11:02 AM Simon Glass <s...@chromium.org> wrote: > > Use the common include along with some additions. > > Drop everything from the config.h file. > > Signed-off-by: Simon Glass <s...@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