On Mon, Aug 05, 2024 at 10:01:27AM +0300, Svyatoslav Ryhel wrote:
> пн, 5 серп. 2024 р. о 08:32 Francesco Dolcini <france...@dolcini.it> пише:
> > On Thu, Aug 01, 2024 at 08:57:38AM +0300, Svyatoslav Ryhel wrote:
> > > Convert boards to use text based env. This is the first stage of
> > > conversion, common inclusions should be converted next.
> > >
> > > Signed-off-by: Svyatoslav Ryhel <clamo...@gmail.com>
> > > ---
> > > board/asus/grouper/grouper.env | 15 +++
> > > .../asus/transformer-t20/transformer-t20.env | 16 ++++
> > > .../transformer-t30/configs/tf600t.config | 1 +
> > > board/asus/transformer-t30/tf600t.env | 16 ++++
> > > .../asus/transformer-t30/transformer-t30.env | 16 ++++
> > > board/htc/endeavoru/endeavoru.env | 13 +++
> > > .../ideapad-yoga-11/ideapad-yoga-11.env | 16 ++++
> > > board/lg/x3-t30/configs/p880.config | 1 +
> > > board/lg/x3-t30/configs/p895.config | 1 +
> > > board/lg/x3-t30/p880.env | 14 +++
> > > board/lg/x3-t30/p895.env | 13 +++
> > > board/microsoft/surface-rt/surface-rt.env | 14 +++
> > > board/nvidia/cardhu/cardhu.env | 2 +
> > > board/nvidia/p2771-0000/p2771-0000.env | 22 +++++
> > > board/nvidia/p3450-0000/p3450-0000.env | 7 ++
> > > board/toradex/apalis-tk1/apalis_tk1.env | 45 +++++++++
> > > board/toradex/apalis_t30/apalis_t30.env | 9 ++
> > > board/toradex/colibri_t20/colibri_t20.env | 3 +
> > > board/toradex/colibri_t30/colibri_t30.env | 9 ++
> > > board/wexler/qc750/qc750.env | 14 +++
> > > configs/apalis-tk1_defconfig | 1 +
> > > configs/apalis_t30_defconfig | 1 +
> > > configs/cardhu_defconfig | 1 +
> > > configs/colibri_t20_defconfig | 1 +
> > > configs/colibri_t30_defconfig | 1 +
> >
> > ...
> >
> > > diff --git a/board/toradex/apalis-tk1/apalis_tk1.env
> > > b/board/toradex/apalis-tk1/apalis_tk1.env
> > > new file mode 100644
> > > index 0000000000..90db361be3
> > > --- /dev/null
> > > +++ b/board/toradex/apalis-tk1/apalis_tk1.env
> > > @@ -0,0 +1,45 @@
> > > +/*
> > > + * Custom Distro Boot configuration:
> > > + * 1. 8bit SD port (MMC1)
> > > + * 2. 4bit SD port (MMC2)
> > > + * 3. eMMC (MMC0)
> > > + */
> > > +boot_targets=mmc1 mmc2 mmc0 usb pxe dhcp
> > > +
> > > +boot_file=zImage
> > > +boot_script_dhcp=boot.scr
> > > +console=ttyS0
> > > +defargs=lp0_vec=2064@0xf46ff000 core_edp_mv=1150 core_edp_ma=4000
> > > + usb_port_owner_info=2 lane_owner_info=6 emc_max_dvfs=0
> > > + user_debug=30 pcie_aspm=off
> > > +dfu_alt_info=apalis-tk1.img raw 0x0 0x500 mmcpart 1;
> > > + boot part 0 1 mmcpart 0;
> > > + rootfs part 0 2 mmcpart 0;
> > > + zImage fat 0 1 mmcpart 0;
> > > + tegra124-apalis-eval.dtb fat 0 1 mmcpart 0
> > > +fdt_board=eval
> > > +fdt_fixup=;
> > > +fdt_module=apalis-v1.2
> > > +uboot_hwpart=1
> > > +uboot_blk=0
> > > +set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff &&
> > > + setexpr blkcnt ${blkcnt} / 0x200
> > > +update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} &&
> > > + mmc write ${loadaddr} ${uboot_blk} ${blkcnt}
> > > +setethupdate=if env exists ethaddr; then; else setenv ethaddr
> > > + 00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr}
> > > + flash_eth.img && source ${loadaddr}
> > > +setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan;
> > > + load ${interface} ${drive}:1 ${loadaddr} flash_blk.img
> > > + || setenv drive 2; mmc rescan; load ${interface} ${drive}:1
> > > + ${loadaddr} flash_blk.img &&
> > > + source ${loadaddr}
> > > +setup=setenv setupargs igb_mac=${ethaddr}
> > > + consoleblank=0 no_console_suspend=1 console=tty1
> > > + console=${console},${baudrate}n8 debug_uartport=lsport,0
> > > + ${memargs}
> > > +setupdate=run setsdupdate || run setusbupdate || run setethupdate
> > > +setusbupdate=usb start && setenv interface usb; setenv drive 0;
> > > + load ${interface} ${drive}:1 ${loadaddr} flash_blk.img &&
> > > + source ${loadaddr}
> > > +vidargs=fbcon=map:1
> >
> > ...
> >
> > > diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
> > > index 71d4727ca9..4c690a1785 100644
> > > --- a/include/configs/apalis-tk1.h
> > > +++ b/include/configs/apalis-tk1.h
> > > @@ -18,64 +18,6 @@
> > > #define FDT_MODULE "apalis-v1.2"
> > > #define FDT_MODULE_V1_0 "apalis"
> > >
> > > -/*
> > > - * Custom Distro Boot configuration:
> > > - * 1. 8bit SD port (MMC1)
> > > - * 2. 4bit SD port (MMC2)
> > > - * 3. eMMC (MMC0)
> > > - */
> > > -#define BOOT_TARGET_DEVICES(func) \
> > > - func(MMC, mmc, 1) \
> > > - func(MMC, mmc, 2) \
> > > - func(MMC, mmc, 0) \
> > > - func(USB, usb, 0) \
> > > - func(PXE, pxe, na) \
> > > - func(DHCP, dhcp, na)
> > > -
> >
> > I do recall that to transition to text env file it was required to move
> > from standard boot to distroboot. Did I recall incorrectly?
>
> Are you 100% sure? Have you tried?
No, I am not, but Simon in copy knows for sure.
What I am sure is that I mean migrating from distroboot to standard boot, the
opposite of what I wrote ...
Francesco
