From d985f1dbddb241c21a9150abf59dd386ba1ffe05 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 6 Jan 2023 08:52:41 -0600 Subject: [PATCH] bootstd: Add a test for the bootstd menu Add a test which checks that two operating systems can be displayed in a menu, allowing one to be selected. Enable a few things on snow so that the unit tests build. Signed-off-by: Simon Glass --- arch/sandbox/dts/test.dts | 11 ++ configs/snow_defconfig | 4 + test/boot/bootflow.c | 51 +++++++ test/py/tests/bootstd/armbian.bmp.xz | Bin 0 -> 1384 bytes test/py/tests/bootstd/mmc4.img.xz | Bin 0 -> 7072 bytes test/py/tests/test_ut.py | 218 ++++++++++++++++++++++++--- 6 files changed, 265 insertions(+), 19 deletions(-) create mode 100644 test/py/tests/bootstd/armbian.bmp.xz create mode 100644 test/py/tests/bootstd/mmc4.img.xz diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index dffe10adbf4..2e580f980fc 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -94,6 +94,10 @@ compatible = "u-boot,distro-efi"; }; + theme { + font-size = <30>; + }; + /* * This is used for the VBE OS-request tests. A FAT filesystem * created in a partition with the VBE information appearing @@ -1013,6 +1017,13 @@ non-removable; }; + /* This is used for bootstd bootmenu tests */ + mmc4 { + status = "disabled"; + compatible = "sandbox,mmc"; + filename = "mmc4.img"; + }; + pch { compatible = "sandbox,pch"; }; diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 6921c5667da..faa3a944c02 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -28,7 +28,11 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2050000 CONFIG_FIT=y CONFIG_FIT_BEST_MATCH=y +CONFIG_BOOTSTD_FULL=y CONFIG_SILENT_CONSOLE=y +CONFIG_BLOBLIST=y +# CONFIG_SPL_BLOBLIST is not set +CONFIG_BLOBLIST_ADDR=0x43d00000 # CONFIG_SPL_FRAMEWORK is not set CONFIG_SPL_FOOTPRINT_LIMIT=y CONFIG_SPL_MAX_FOOTPRINT=0x3800 diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 00dfd990687..abafa44b2ed 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -11,15 +11,21 @@ #include #include #include +#include #include #ifdef CONFIG_SANDBOX #include #endif +#include #include #include #include #include "bootstd_common.h" +DECLARE_GLOBAL_DATA_PTR; + +extern U_BOOT_DRIVER(bootmeth_script); + static int inject_response(struct unit_test_state *uts) { /* @@ -462,3 +468,48 @@ static int bootflow_cmd_boot(struct unit_test_state *uts) return 0; } BOOTSTD_TEST(bootflow_cmd_boot, UT_TESTF_DM | UT_TESTF_SCAN_FDT); + +/* Check 'bootflow menu' to select a bootflow */ +static int bootflow_cmd_menu(struct unit_test_state *uts) +{ + static const char *order[] = {"mmc2", "mmc1", "mmc4", NULL}; + struct udevice *dev, *bootstd; + struct bootstd_priv *std; + const char **old_order; + char prev[3]; + ofnode node; + + /* Enable the mmc4 node since we need a second bootflow */ + node = ofnode_path("/mmc4"); + ut_assertok(lists_bind_fdt(gd->dm_root, node, &dev, NULL, false)); + + /* Enable the script bootmeth too */ + ut_assertok(uclass_first_device_err(UCLASS_BOOTSTD, &bootstd)); + ut_assertok(device_bind(bootstd, DM_DRIVER_REF(bootmeth_script), + "bootmeth_script", 0, ofnode_null(), &dev)); + + /* Change the order to include mmc4 */ + std = dev_get_priv(bootstd); + old_order = std->bootdev_order; + std->bootdev_order = order; + + console_record_reset_enable(); + ut_assertok(run_command("bootflow scan", 0)); + ut_assert_console_end(); + + /* Restore the order used by the device tree */ + std->bootdev_order = old_order; + + /* Add keypresses to move to and select the second one in the list */ + prev[0] = CTL_CH('n'); + prev[1] = '\r'; + prev[2] = '\0'; + ut_asserteq(2, console_in_puts(prev)); + + ut_assertok(run_command("bootflow menu", 0)); + ut_assert_nextline("Selected: Armbian"); + ut_assert_console_end(); + + return 0; +} +BOOTSTD_TEST(bootflow_cmd_menu, UT_TESTF_DM | UT_TESTF_SCAN_FDT); diff --git a/test/py/tests/bootstd/armbian.bmp.xz b/test/py/tests/bootstd/armbian.bmp.xz new file mode 100644 index 0000000000000000000000000000000000000000..ad137ea6e6df5c51d0a98a4be190c4cb4c48fc76 GIT binary patch literal 1384 zc-jGI1(*8$H+ooF000E$*0e?f03iV!0000G&sfahT|osUT>v2yL`vV4GWns~_Xm1L zxE>Ubk@J6u_+aW`8~-8B2G301rYP}LjG-Uj!5v5M@cMEp)w7Jy+>!JE+yYjbr*Cj;GV^2Hw z@W7BuO=bDneVey~z?{IPxUWVi=>AB+fXkNrMXePTCtS4$20)TF&Ej-}em=4#*uIHD z1l@)}!B8#S*Y2}K?!cbS0x0Q6+%GVl9r84w9-r^ww#S)^#5L%?tS_gQGFqN4x0;M* z069Xd{Tg$MBJXPB3ZuxY@@+^>NZzLHs%(t8LBUGbn8_tB+-cv$3n422Xoz1d8hrHM z(HW_#2QB54kA#LC*EWh*<^|;Iq{oeo2`LwHJ&s-Um&v;`ilv|L2QbW*>IAi?Ac$V1;eoHwRcj6<3Yj~Om#>)(xD*U9^*iF z(_&Bn;ATGLy(x8wegW)L3qq6kQv=_3Z zx*?Kp$;0{#iDe|0~1!@^T z)sbCy$vmaHvbwE}%8WHO)D1ZmGr2!sS+OWbZF=;oH_jv+}huqHA-6Xk^mvDd5M z(nV_bZUl6s z0M21Xax4^PqqUQB_#oh0zKUmjc`-*=$Yu=#ARfS%t8K^XZk83$pxE{bst#FcVg*`V z50vnrqts+Y9yvx&WN-3m0S*!nB~!7YuX!%)BKGIjHybq_@N8&zRFA>YNjS{Vc4FH4 qtay zorp4=^R0D$oPXzi*E-)>@3+pk|2}K4=h^qV*S`0)u~GprGXMY=GuHsY0k8p?0002R zIBewZ?h*d(a{#~%d!uQLHlr54li(F(%0&INnku_`-$#DRP@UYW>mQ)!S^JDvLMbyp z45QQ{S*y-Pot!9J zZ&Rufqe9RD;T#OWr;I3Qf3SLYEU#s!lt@K(N0IW|Oa{v`SefI3Fb{-9R19^bbBLTo|W^Nc^uGV0cGtq#*?rWmn z9BEDCqMJo+M7vUqA%F0^j#w_SM~;5`!qRy7Dd`&bfQ{l1HxBU-^SQeLpN1~_?QkAh z{0^3TZ9NmCjGGV0_(5^JxL+fcO2uA~wf!{CEsoIpk5O8BzWH-@Ef&Hr*Am;8KN&w; z(=3a8bg_7M_$|f1PLt%wKG{E%fHF7h%=+~s72|E2*y>KFN$LeGm4|e zOy*1KwGv-a6VJ`VZB6*N?IG)umjipOko~ku2tOIuPZ{G(M2IP24s7&#a_*OF>ispK zCA09CTrwBh`faSl91}p?poBAsY*}}U;H+1oI(}90ls!LMJlN(0GjXz|3g$f}hW>QI zVg^-bm3rO0GOs4JkSQ}STe3yClevi}Z!EtaZD*y56?-8O!C)6(bt@U$O4Yxb>XX~YsFPjK#{5^Xenf49wuNfcf z9F?u{<%$`m#kAR*pc?_Wp7U%6j@dg59D=%Fncv%P+Qocq+DLC@GL?z}7Ai&u=8>I` z1AKiGXWaSnC(<5$-A#=+J|OjPb)Y~>#7)E|n2=$>);cDdnig(4EC^~VYO=q7IwYCS zBiE<@_(jU}J@BtW_a6eFsK_kWw!m7yWkgY6BVOvWYL)|$8fqBF26H3nWkfuJPJ^alMW=WLfCa)abk|RT=>rX;AX<)`s`*Rua`faF4iq6121yd@DDMP5 zFyE_0wF*ppvASDzIKoAxKPN1A#L#LAZT66(Up=0RV&a>t2vs`v-}JwcjD%PoFu0q(>o4?k#gp zPQ=_~FtQ@QLMtOFT5F7=v|+|}^gFR&&7mkvVVWBxM_%W+`1uR`4O#F+s9D{8_oCyX zE}`UGngejiyZqdPd==D5NR@S4w-@CxP&&%GGPNS8YTVAp&3>UrhYsQEK-6>@V$Zb{ zY|QYI3RLVG;kC;iv=fXIe1`sdZSj@}V*Yis>q6^I!tGA~ySA&JO$V@FIM8yzHG?gx zNk%n(eTtqGZ^a1}KGqswOnf5O(3^s#ajKpSzS+ioB$!O`w8RM<*k=kg15R?Q> z`X}wr~;5L?0$ zSCSIz%Fn&DOSLQLromb=z6mHtC1-7F9rDZQ2;svo{H;gND2Y8C{~mnMU6#5_R4Sv8 z23WZD2NCaH*_|0@g(nGZa&d=r!oyYfoMI069`|s>WLie_Ti&D-E}sif7k-9L26n!B zHj(_lQiLD12}j<&0=fhCybO!69aVuM49Lbf5!e55KV!ZpkPz==>1890*DF|R*fmVE z-2ox)Cuzm~Fv#nJJB`~EN+tEosU$3Jr9*%G`f#T)%fhwZ?;CXlGk*+=!7`_|=1E#k z#DJYjnSCJ?xBdlGKcg;`HBfRfCH>b7&2Z1Kc&n3W?OP9s2O$UW71c9wU1sE881SDF zlmANzy>fKTiM*o#^8IDi|Hg;RNB zB0LlN$M~_+Op-)sSe{{S?i*W+6gTBw8-hDJnS2)`I{6aKW?s-kmR@P!{etTEn#?v0 zQmOk{IHsRCvdv`=7K2{(EAbv1Ch6}VXbn3{YJTIlijUnMJ-jRbFaiGV3|_(_X8TJ3 zF$)ak3Fn&iy-+8)TXpi^dV;GT$zn|?=tT=y8<>wT*-rEa zdsl}%lNVyw_xl8%|C(>l4AyaA(Rtw5%td3g)mieS!5OGbEPkcs4(McCxiBIFhR2&) z?oSd;PahD^peB4#C-arQ>A`mPGSzyy`B+1RNQMPmMDi_@aZRI%OP^lg_Gy&B@yzYG z+Po(dG$-{y8%XgmVfD9xOka-jJ7Z8^hv)Iv%iR3_TCcQm1Vx;qWwrD2&XT5c``+vD z2bdy)8TAzV`($TiTYh!--gx)c6>^Gi<1OB5Mvu;NwAM9{q+`3fER2YBJ}plLwc6tg z@3>zphF1O#hJBoFl)}vyR$<9F6^LixNpE6;#D1UqOqrzfpo8@jY;A~#*KUlKbv{MQ z?qv*M6Fnr0@i1KU;mGr0yEVp?t3L-**U|ZW9|>oH-4apXls?W*BtCVDea#g11uM}P zk)Mkvq}pWlu}~-#x9V{$RP{7*ztiC zh!ZkHYj^qXqzo1=%gc!p1)B&w$-{4&lzKVBaLb}Td=`Z(%U>mo2@V-`(-VX<`83R< zUgx%ZYlO!{Iy#&!7qaHDSH+NpJ?f+ zE+A!+^1AOB{lnUy36~E7&X_nsp~V#kX>S$Q&b-=2w6%{bDjwR**2}uPWH>nMLWK`l znmeAvNAo_hjLGr+eOc8}vFeaRrS){_20kInKYBQJc53PNLz|EnXG~*!v@WRhJV<3E z*SLrv1xip@t8mamJ@J4+Bs^)YIJ^nnRpKMS zW)RTm#};FnIveiru;qpykDOvi=jc3n^P-e}S^V2})qd9D3VSUoOcDhND820~l0ilp z=jkQ8-b>VGGPL!4&sgzhgX>j9#3CqLREdryEV)fJmXv)`n~dvH`ubsusyC>rDSa%R z+cmLxi;XaLzJdx@PERd65vCQq@_L>U${tOUr|j64!@~YUN_MeT*22FPBs_hL`Pvi` z=rnsVKzI_7{Jx9ZonjocQxi*z`AxI;{cV9N1c4M*0@$JD-t!l?-nHK{$%%+=P&Jf8EqvE0yHq&os)wM8 zg$wWK6BOt32tv@1ve6l5$Dt1H(ehEBR$xe5%jl;QxSW<*6ZS>pEAFXTlid+ISCo}= zVBYbrIVK_@rssEP=66(6-Jy;IK9Os!%2gdRt&T#i2}6MLZubg=ELnQ;3MD6MSN7W)N{7 zDc|eLEq~r?2F~f(LUnnbbtFeYSV4jnuTF{u&rD-3AIGbi=(g2CCzqC4XRQ?7!gvDi ziI=@F7dK?Zxv3356JE*AS3SVJP{Q)}j}4)GLaD|T3vRt(^%XN@f6N(onuIRPI2m z@P_zU`G%sP>%qsadn}cObnl`sO>~XWSY?6zDzq&gn2cR)ePx9)-KWQWrm6-rTO*ZB zBGqiRZOxK!V(zzd-pB{J5ZCz`SMbzv<^{$3Z7Cfq2Vs1Gq&qDB;U~WKEDakd3L>?| zFp)&eA2br7s~e_2rc*T@PZHRtW}r;2%75$mQ`(xTO`n|Ln@KF1A#iKi){n z(&mZcYY~_BE!EY3m2!`dWj<9rcs#YGG-1$Rn^^=ztt4eg{DGmkmoXq(-MHPYTmFy_ zc>nQK#RzqWKoH@JT{WV;?IzN}<|5n&vHPK80*hnPwq~2A<%e;ddHUIwap`P4^k|d* z2RX;XcPRQ@r%p}thHjRErFCVME3XLhMG&n{T5m0eFq@esr$*UkCVaDd&We0APry`x z*`|VC-WBIEMk*5IKRvQDuVHzbnI}Z3-9Mxmtou&fJz`J1q^>V6o5YkJ=OwJ=z6B{71USKBXzh>%Zi%TqYt`1&Ex(D?Fl`Qe z#Ohu@OS&dc_fBvGgoo|G+!ooJD%s_EaJ2>i6Y)UT0P?iRod*fr$Kn z3K1s(%0YFo1+&Qii$8%s' % (infname, fname)]) + +def setup_bootmenu_image(cons): + """Create a 20MB disk image with a single ext4 partition + + This is modelled on Armbian 22.08 Jammy + """ + mmc_dev = 4 + fname, mnt = setup_image(cons, mmc_dev, 0x83) loop = None mounted = False complete = False try: - out = u_boot_utils.run_and_log(cons, - 'sudo losetup --show -f -P %s' % fname) - loop = out.strip() - fatpart = '%sp1' % loop - u_boot_utils.run_and_log(cons, 'sudo mkfs.vfat %s' % fatpart) + loop = mount_image(cons, fname, mnt, 'ext4') + mounted = True + + vmlinux = 'Image' + initrd = 'uInitrd' + dtbdir = 'dtb' + script = '''# DO NOT EDIT THIS FILE +# +# Please edit /boot/armbianEnv.txt to set supported parameters +# + +setenv load_addr "0x9000000" +setenv overlay_error "false" +# default values +setenv rootdev "/dev/mmcblk%dp1" +setenv verbosity "1" +setenv console "both" +setenv bootlogo "false" +setenv rootfstype "ext4" +setenv docker_optimizations "on" +setenv earlycon "off" + +echo "Boot script loaded from ${devtype} ${devnum}" + +if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then + load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt + env import -t ${load_addr} ${filesize} +fi + +if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi + +if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi +if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi +if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi +if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi + +# get PARTUUID of first partition on SD/eMMC the boot script was loaded from +if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi + +setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}" + +if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"; fi + +load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd +load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image + +load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile} +fdt addr ${fdt_addr_r} +fdt resize 65536 +for overlay_file in ${overlays}; do + if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then + echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo" + fdt apply ${load_addr} || setenv overlay_error "true" + fi +done +for overlay_file in ${user_overlays}; do + if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then + echo "Applying user provided DT overlay ${overlay_file}.dtbo" + fdt apply ${load_addr} || setenv overlay_error "true" + fi +done +if test "${overlay_error}" = "true"; then + echo "Error applying DT overlays, restoring original DT" + load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile} +else + if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then + echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)" + source ${load_addr} + fi + if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then + load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr + echo "Applying user provided fixup script (fixup.scr)" + source ${load_addr} + fi +fi +booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r} + +# Recompile with: +# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr +''' % (mmc_dev) + bootdir = os.path.join(mnt, 'boot') + mkdir_cond(bootdir) + cmd_fname = os.path.join(bootdir, 'boot.cmd') + scr_fname = os.path.join(bootdir, 'boot.scr') + with open(cmd_fname, 'w') as outf: + print(script, file=outf) + + infname = os.path.join(cons.config.source_dir, + 'test/py/tests/bootstd/armbian.bmp.xz') + bmp_file = os.path.join(bootdir, 'boot.bmp') + u_boot_utils.run_and_log( + cons, + ['sh', '-c', f'xz -dc {infname} >{bmp_file}']) + + u_boot_utils.run_and_log( + cons, f'mkimage -C none -A arm -T script -d {cmd_fname} {scr_fname}') + + kernel = 'vmlinuz-5.15.63-rockchip64' + target = os.path.join(bootdir, kernel) + with open(target, 'wb') as outf: + print('kernel', outf) + + symlink = os.path.join(bootdir, 'Image') + if os.path.exists(symlink): + os.remove(symlink) + u_boot_utils.run_and_log( + cons, f'echo here {kernel} {symlink}') + os.symlink(kernel, symlink) + u_boot_utils.run_and_log( - cons, 'sudo mount -o loop %s %s -o uid=%d,gid=%d' % - (fatpart, mnt, os.getuid(), os.getgid())) + cons, f'mkimage -C none -A arm -T script -d {cmd_fname} {scr_fname}') + complete = True + + except ValueError as exc: + print('Falled to create image, failing back to prepared copy: %s', + str(exc)) + finally: + if mounted: + u_boot_utils.run_and_log(cons, 'sudo umount %s' % mnt) + if loop: + u_boot_utils.run_and_log(cons, 'sudo losetup -d %s' % loop) + + if not complete: + copy_prepared_image(cons, mmc_dev, fname) + +def setup_bootflow_image(cons): + """Create a 20MB disk image with a single FAT partition""" + mmc_dev = 1 + fname, mnt = setup_image(cons, mmc_dev, 0xc) + + loop = None + mounted = False + complete = False + try: + loop = mount_image(cons, fname, mnt, 'vfat') mounted = True vmlinux = 'vmlinuz-5.3.7-301.fc31.armv7hl' @@ -90,12 +274,7 @@ label Fedora-Workstation-armhfp-31-1.9 (5.3.7-301.fc31.armv7hl) u_boot_utils.run_and_log(cons, 'sudo losetup -d %s' % loop) if not complete: - # Use a prepared image since we cannot create one - infname = os.path.join(cons.config.source_dir, - 'test/py/tests/bootstd/mmc1.img.xz') - u_boot_utils.run_and_log( - cons, - ['sh', '-c', 'xz -dc %s >%s' % (infname, fname)]) + copy_prepared_image(cons, mmc_dev, fname) @pytest.mark.buildconfigspec('ut_dm') @@ -134,6 +313,7 @@ def test_ut_dm_init_bootstd(u_boot_console): """Initialise data for bootflow tests""" setup_bootflow_image(u_boot_console) + setup_bootmenu_image(u_boot_console) # Restart so that the new mmc1.img is picked up u_boot_console.restart_uboot() -- 2.39.5