From mboxrd@z Thu Jan 1 00:00:00 1970 From: Soeren Moch Date: Tue, 28 Jan 2020 18:51:26 +0100 Subject: [PATCH v2][ 3/3] board: tbs2910: Add support for generic distro configuration In-Reply-To: <20200128170418.15912-3-GNUtoo@cyberdimension.org> References: <20200128170418.15912-1-GNUtoo@cyberdimension.org> <20200128170418.15912-3-GNUtoo@cyberdimension.org> Message-ID: <598f8fa5-3782-34c0-327e-d95e47def145@web.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de On 28.01.20 18:04, Denis 'GNUtoo' Carikli wrote: > This keeps the compatibility with the old bootcmd. > > The fdtfile environment variable also needed to be set to > imx6q-tbs2910.dtb to enable booting mainline kernels > otherwise with extlinux.conf it tries to load > mx6-tbs2910.dtb instead. > > Signed-off-by: Denis 'GNUtoo' Carikli There are a lot of unrelated/unexplained changes in tbs2910_defconfig. This probably should not be part of this patch. As already discussed, the bootm_size environment variable is not necessary, otherwise=C2=A0 somewhat dangerous with this value. The requested changes for CONFIG_BOOTCOMMAND are not addressed in this v2. Soeren > --- > configs/tbs2910_defconfig | 17 ++++------------- > include/configs/tbs2910.h | 37 ++++++++++++++++++++++++++++--------- > 2 files changed, 32 insertions(+), 22 deletions(-) > > diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig > index 0e91eeffd4..0d9e11bd20 100644 > --- a/configs/tbs2910_defconfig > +++ b/configs/tbs2910_defconfig > @@ -9,16 +9,16 @@ CONFIG_NR_DRAM_BANKS=3D1 > CONFIG_PRE_CON_BUF_ADDR=3D0x7c000000 > CONFIG_CMD_HDMIDETECT=3Dy > CONFIG_AHCI=3Dy > +CONFIG_DISTRO_DEFAULTS=3Dy > CONFIG_BOOTDELAY=3D3 > +# CONFIG_USE_BOOTCOMMAND is not set > CONFIG_USE_PREBOOT=3Dy > CONFIG_PREBOOT=3D"echo PCI:; pci enum; pci 1; usb start; if hdmidet; the= n run set_con_hdmi; else run set_con_serial; fi" > CONFIG_PRE_CONSOLE_BUFFER=3Dy > -CONFIG_SUPPORT_RAW_INITRD=3Dy > +CONFIG_DEFAULT_FDT_FILE=3D"imx6q-tbs2910.dtb" > CONFIG_BOUNCE_BUFFER=3Dy > CONFIG_BOARD_EARLY_INIT_F=3Dy > -CONFIG_HUSH_PARSER=3Dy > CONFIG_SYS_PROMPT=3D"Matrix U-Boot> " > -CONFIG_CMD_BOOTZ=3Dy > # CONFIG_BOOTM_PLAN9 is not set > # CONFIG_BOOTM_RTEMS is not set > # CONFIG_BOOTM_VXWORKS is not set > @@ -30,22 +30,14 @@ CONFIG_CMD_I2C=3Dy > # CONFIG_CMD_LOADB is not set > # CONFIG_CMD_LOADS is not set > CONFIG_CMD_MMC=3Dy > -CONFIG_CMD_PART=3Dy > CONFIG_CMD_PCI=3Dy > CONFIG_CMD_SATA=3Dy > CONFIG_CMD_USB=3Dy > CONFIG_CMD_USB_MASS_STORAGE=3Dy > -CONFIG_CMD_DHCP=3Dy > -CONFIG_CMD_MII=3Dy > -CONFIG_CMD_PING=3Dy > CONFIG_CMD_CACHE=3Dy > CONFIG_CMD_TIME=3Dy > -CONFIG_CMD_EXT2=3Dy > -CONFIG_CMD_EXT4=3Dy > CONFIG_CMD_EXT4_WRITE=3Dy > -CONFIG_CMD_FAT=3Dy > -CONFIG_CMD_FS_GENERIC=3Dy > -CONFIG_EFI_PARTITION=3Dy > +# CONFIG_ISO_PARTITION is not set > CONFIG_OF_CONTROL=3Dy > CONFIG_OF_EMBED=3Dy > CONFIG_DEFAULT_DEVICE_TREE=3D"imx6q-tbs2910" > @@ -75,7 +67,6 @@ CONFIG_RTC_DS1307=3Dy > CONFIG_DM_THERMAL=3Dy > CONFIG_USB=3Dy > CONFIG_DM_USB=3Dy > -CONFIG_USB_STORAGE=3Dy > CONFIG_USB_KEYBOARD=3Dy > CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=3Dy > CONFIG_USB_GADGET=3Dy > diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h > index b598fca1ec..abeca16555 100644 > --- a/include/configs/tbs2910.h > +++ b/include/configs/tbs2910.h > @@ -8,6 +8,24 @@ > #ifndef __TBS2910_CONFIG_H > #define __TBS2910_CONFIG_H > =20 > +#define CONFIG_BOOTCOMMAND \ > + "mmc rescan; " \ > + "if run bootcmd_up1; then " \ > + "run bootcmd_up2; " \ > + "else " \ > + "run bootcmd_mmc || run distro_bootcmd; " \ > + "fi" > + > +#define BOOT_TARGET_DEVICES(func) \ > + func(MMC, mmc, 0) \ > + func(MMC, mmc, 1) \ > + func(MMC, mmc, 2) \ > + func(SATA, sata, 0) \ > + func(USB, usb, 0) \ > + func(PXE, pxe, na) \ > + func(DHCP, dhcp, na) > +#include > + > #include "mx6_common.h" > =20 > /* General configuration */ > @@ -80,6 +98,13 @@ > #define CONFIG_BOARD_SIZE_LIMIT 392192 /* (CONFIG_ENV_OFFSET - 1024) */ > =20 > #define CONFIG_EXTRA_ENV_SETTINGS \ > + "bootm_size=3D0x80000000\0" \ > + "fdt_addr=3D0x13000000\0" \ > + "fdt_addr_r=3D0x13000000\0" \ > + "kernel_addr_r=3D0x10008000\0" \ > + "pxefile_addr_r=3D0x10008000\0" \ > + "ramdisk_addr_r=3D0x18000000\0" \ > + "scriptaddr=3D0x14000000\0" \ > "bootargs_mmc1=3Dconsole=3Dttymxc0,115200 di0_primary console=3Dtty1\0"= \ > "bootargs_mmc2=3Dvideo=3Dmxcfb0:dev=3Dhdmi,1920x1080M at 60 " \ > "video=3Dmxcfb1:off video=3Dmxcfb2:off fbmem=3D28M\0" \ > @@ -102,14 +127,8 @@ > "setenv stderr serial,vga\0" \ > "stderr=3Dserial,vga\0" \ > "stdin=3Dserial,usbkbd\0" \ > - "stdout=3Dserial,vga\0" > - > -#define CONFIG_BOOTCOMMAND \ > - "mmc rescan; " \ > - "if run bootcmd_up1; then " \ > - "run bootcmd_up2; " \ > - "else " \ > - "run bootcmd_mmc; " \ > - "fi" > + "stdout=3Dserial,vga\0" \ > + "fdtfile=3D" CONFIG_DEFAULT_FDT_FILE "\0" \ > + BOOTENV > =20 > #endif /* __TBS2910_CONFIG_H * */