Skip to content

Commit f1252aa

Browse files
samueldrsamueldr
committed
Integration branch for Tow-Boot 2023.07
This branch includes changes from the following 38 branches: - e1b16ea ⇒ tow-boot/2023.07/upstream-fix-cmd-bmp-dep - 69e285f ⇒ tow-boot/2023.07/base-cli-ctrl-clear - 2498667 ⇒ tow-boot/2023.07/base-framebuffer-clear - c7f4f08 ⇒ tow-boot/2023.07/base-smbios-enclosure-support - d5ac2b8 ⇒ tow-boot/2023.07/base-spi-gigadevice - 38bdc8d ⇒ tow-boot/2023.07/base-spi-xtx - 2507c45 ⇒ tow-boot/2023.07/base-sunxi-env-dev - 7642e0d ⇒ tow-boot/2023.07/base-vidconsole-ansi-cursor-column - b93fdf5 ⇒ tow-boot/2023.07/base-video-bmp-clamp - 841238d ⇒ tow-boot/2023.07/wip-01-01-autoboot-prompt - f0a215a ⇒ tow-boot/2023.07/wip-01-02-autoboot-improvements - 98c405e ⇒ tow-boot/2023.07/wip-fix-gzip-dep - f1879d0 ⇒ tow-boot/2023.07/wip-hack-video-sync-dirty - aee4613 ⇒ tow-boot/2023.07/wip-vibrator-class - 277a48b ⇒ tow-boot/2023.07/tb-01-01-pdcurses - 52f85a5 ⇒ tow-boot/2023.07/tb-01-02-boot-menu - 3c4f3b8 ⇒ tow-boot/2023.07/tb-01-05-wip-splash-improvements - 4a3fc3c ⇒ tow-boot/2023.07/tb-02-01-identify-as-tow-boot - 1ee7273 ⇒ tow-boot/2023.07/tb-02-02-opinionated-boot-flow - 1c08306 ⇒ tow-boot/2023.07/tb-02-03-predictable-boot-order - b9b798d ⇒ tow-boot/2023.07/tb-90-01-board-sandbox - cc3238e ⇒ tow-boot/2023.07/soc-rockchip-01-01-distroboot - 9be37bd ⇒ tow-boot/2023.07/soc-rockchip-01-02-predictable-boot-order - c7922bc ⇒ tow-boot/2023.07/soc-rockchip-_base - ad88805 ⇒ tow-boot/2023.07/soc-rockchip-efi-reset-workaround - 6b51c59 ⇒ tow-boot/2023.07/soc-rockchip-no-dlmode - 0780263 ⇒ tow-boot/2023.07/soc-rockchip-rk3399-dt-sync - 2a0a67c ⇒ tow-boot/2023.07/soc-rockchip-setup_gpio_pins - db8ea24 ⇒ tow-boot/2023.07/soc-rockchip-spl-gpio - 5ac2d04 ⇒ tow-boot/2023.07/board-libreComputer-rocRk3399Pc - 108b4eb ⇒ tow-boot/2023.07/board-odroid-N2 - 374e88d ⇒ tow-boot/2023.07/board-orangePi-zeroPlus2H5 - 8f64f99 ⇒ tow-boot/2023.07/board-pine64-pinebookPro - 8354882 ⇒ tow-boot/2023.07/board-pine64-pinephoneA64 - 9d14cf1 ⇒ tow-boot/2023.07/board-pine64-pinephonePro - 44336e8 ⇒ tow-boot/2023.07/board-radxa-RockPi4 - 7d0800d ⇒ tow-boot/2023.07/board-radxa-zero2 - 5fd450d ⇒ tow-boot/2023.07/board-raspberrypi Including contributions from: - 55 Samuel Dionne-Riel - 3 Antoni Przybylik - 3 Martijn Braam - 2 Carl Richard Theodor Schneider - 2 Da Xue - 1 Arnaud Patard - 1 Icenowy Zheng - 1 Las - 1 Marius Gripsgard - 1 Michal Suchanek - 1 Milan Pässler - 1 Ondrej Jirman - 1 Ulrik Strid - 1 Yuntian Zhang
35 parents 05aa651 + e1b16ea + 69e285f + 2498667 + c7f4f08 + d5ac2b8 + 38bdc8d + 2507c45 + b93fdf5 + 98c405e + f1879d0 + aee4613 + 277a48b + 52f85a5 + 3c4f3b8 + 4a3fc3c + 1ee7273 + 1c08306 + b9b798d + 9be37bd + c7922bc + ad88805 + 6b51c59 + 0780263 + 2a0a67c + db8ea24 + 5ac2d04 + 108b4eb + 374e88d + 8f64f99 + 8354882 + 9d14cf1 + 44336e8 + 7d0800d + 5fd450d commit f1252aa

203 files changed

Lines changed: 32999 additions & 215 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Kconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,3 +612,5 @@ source "lib/Kconfig"
612612
source "test/Kconfig"
613613

614614
source "tools/Kconfig"
615+
616+
source "Tow-Boot/Kconfig"

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,7 @@ prepare: prepare0
19201920
# Use sed to remove leading zeros from PATCHLEVEL to avoid using octal numbers
19211921
define filechk_version.h
19221922
(echo \#define PLAIN_VERSION \"$(UBOOTRELEASE)\"; \
1923-
echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION; \
1923+
echo \#define U_BOOT_VERSION \"Tow-Boot \" PLAIN_VERSION; \
19241924
echo \#define U_BOOT_VERSION_NUM $(VERSION); \
19251925
echo \#define U_BOOT_VERSION_NUM_PATCH $$(echo $(PATCHLEVEL) | \
19261926
sed -e "s/^0*//"); \

‎Tow-Boot/Kconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
menu "Tow-Boot specific customizations"
2+
3+
source "Tow-Boot/Kconfig.predictable_boot"
4+
5+
endmenu

‎Tow-Boot/Kconfig.predictable_boot‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
choice
2+
prompt "Tow-Boot predictable boot"
3+
default TOW_BOOT_PREDICTABLE_BOOT_PREFER_INTERNAL
4+
help
5+
Selects which predictable boot order strategy is used.
6+
- Internal prefers eMMC, NVMe, SCSI, SD, then USB
7+
- External prefers the inverse order
8+
Both order will keep network boot and SF booting at the end of the list.
9+
10+
config TOW_BOOT_PREDICTABLE_BOOT_PREFER_INTERNAL
11+
bool "Prefer the more internal storage first"
12+
13+
config TOW_BOOT_PREDICTABLE_BOOT_PREFER_EXTERNAL
14+
bool "Prefer the more external storage first"
15+
16+
endchoice

‎arch/arm/Kconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1985,7 +1985,8 @@ config ARCH_ROCKCHIP
19851985
imply ADC
19861986
imply CMD_DM
19871987
imply DEBUG_UART_BOARD_INIT
1988-
imply BOOTSTD_DEFAULTS
1988+
imply DISTRO_DEFAULTS if !ROCKCHIP_RK3399
1989+
imply BOOTSTD_DEFAULTS if !DISTRO_DEFAULTS
19891990
imply FAT_WRITE
19901991
imply SARADC_ROCKCHIP
19911992
imply SPL_SYSRESET

‎arch/arm/dts/meson-g12b-odroid-n2.dtsi‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,12 @@
268268
linux,rc-map-name = "rc-odroid";
269269
};
270270

271+
/* eMMC */
272+
&sd_emmc_c {
273+
pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_4b_pins>, <&emmc_ds_pins>;
274+
bus-width = <4>;
275+
};
276+
271277
/*
272278
* EMMC_D4, EMMC_D5, EMMC_D6 and EMMC_D7 pins are shared between SPI NOR pins
273279
* and eMMC Data 4 to 7 pins.
@@ -276,7 +282,7 @@
276282
* The SW1 slide should also be set to the correct position.
277283
*/
278284
&spifc {
279-
status = "disabled";
285+
status = "okay";
280286
pinctrl-0 = <&nor_pins>;
281287
pinctrl-names = "default";
282288

‎arch/arm/dts/rk3399-opp.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
/ {
7-
cluster0_opp: opp-table0 {
7+
cluster0_opp: opp-table-0 {
88
compatible = "operating-points-v2";
99
opp-shared;
1010

@@ -35,7 +35,7 @@
3535
};
3636
};
3737

38-
cluster1_opp: opp-table1 {
38+
cluster1_opp: opp-table-1 {
3939
compatible = "operating-points-v2";
4040
opp-shared;
4141

@@ -74,7 +74,7 @@
7474
};
7575
};
7676

77-
gpu_opp_table: opp-table2 {
77+
gpu_opp_table: opp-table-2 {
7878
compatible = "operating-points-v2";
7979

8080
opp00 {

‎arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,45 @@
77
#include "rk3399-sdram-lpddr4-100.dtsi"
88

99
/ {
10+
aliases {
11+
spi0 = &spi1;
12+
};
13+
1014
chosen {
11-
u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
15+
u-boot,spl-boot-order = "same-as-spl", &spiflash, &sdhci, &sdmmc;
1216
};
1317

1418
config {
1519
u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
1620
};
21+
smbios {
22+
compatible = "u-boot,sysinfo-smbios";
23+
24+
smbios {
25+
system {
26+
manufacturer = "PINE64";
27+
product = "PinePhone Pro";
28+
family = "PinePhone";
29+
};
30+
31+
baseboard {
32+
manufacturer = "PINE64";
33+
product = "PinePhone Pro";
34+
};
35+
36+
chassis {
37+
manufacturer = "PINE64";
38+
};
39+
};
40+
};
41+
};
42+
43+
&i2c0 {
44+
bootph-all;
45+
};
46+
47+
&rk818 {
48+
bootph-all;
1749
};
1850

1951
&rng {
@@ -29,3 +61,7 @@
2961
max-frequency = <20000000>;
3062
bootph-all;
3163
};
64+
65+
&spiflash {
66+
bootph-all;
67+
};

‎arch/arm/dts/rk3399-pinephone-pro.dts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,16 @@
442442
status = "okay";
443443
};
444444

445+
&spi1 {
446+
status = "okay";
447+
448+
spiflash: flash@0 {
449+
compatible = "jedec,spi-nor";
450+
reg = <0>;
451+
spi-max-frequency = <10000000>;
452+
};
453+
};
454+
445455
&tsadc {
446456
rockchip,hw-tshut-mode = <1>;
447457
rockchip,hw-tshut-polarity = <1>;

‎arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,27 @@
88

99
/ {
1010
chosen {
11-
u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
11+
u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdmmc, &sdhci;
12+
};
13+
14+
config {
15+
u-boot,spl-payload-offset = <0x60000>;
16+
};
17+
};
18+
19+
&spi1 {
20+
status = "okay";
21+
22+
flash@0 {
23+
compatible = "jedec,spi-nor";
24+
reg = <0>;
25+
spi-max-frequency = <10000000>;
26+
};
27+
};
28+
29+
&spi1 {
30+
spi_flash: flash@0 {
31+
bootph-all;
1232
};
1333
};
1434

0 commit comments

Comments
 (0)