Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uboot image fixes #6

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Uboot image fixes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
594637f
Correcting replacement of UCLASS_SPI_FLASH: should be replaced by UCL…
dmikushin Mar 14, 2023
5dc69c5
Clone some recent release branch of U-boot, not just the topmost comm…
dmikushin Mar 14, 2023
54fa831
Ensuring each sed instruction has actually replaced something, by che…
dmikushin Mar 14, 2023
0ee3a40
Write u-boot.itb twice, because on SD card it will be searched for at…
dmikushin Mar 14, 2023
9916b5e
No need for a semicolon after DM_DRIVER_ALIAS, because it's a macro p…
dmikushin Mar 14, 2023
b599099
Adding a missing dot in .config filename, which was breaking the whol…
dmikushin Mar 14, 2023
182351a
Adding notes on enabling debug logging in U-boot
dmikushin Mar 14, 2023
d9b2b50
At this time, let MMC to have boot priority over SPI Flash, so that i…
dmikushin Mar 14, 2023
1ddd65d
Prepend u-boot.itb building command with BL31 env symbol as well, oth…
dmikushin Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ RUN apt update && \
swig \
libssl-dev \
bc \
vim \
less \
tmux
device-tree-compiler

###############################################################################

Expand All @@ -44,11 +42,12 @@ RUN git checkout v2.3 && \

FROM toolchain as u-boot

RUN git clone --depth 1 https://source.denx.de/u-boot/u-boot.git
RUN git clone https://source.denx.de/u-boot/u-boot.git

WORKDIR /u-boot

RUN make nanopi-r2s-rk3328_defconfig
RUN git checkout v2023.01 && \
make nanopi-r2s-rk3328_defconfig

RUN <<EOF cat >> .config_extra
CONFIG_ROCKCHIP_EFUSE=y
Expand Down Expand Up @@ -80,7 +79,7 @@ EOF

RUN cat .config_extra | sed 's|=.*|=|' | xargs -I{} sed -i 's|{}.*||' .config

RUN cat .config_extra >> config
RUN cat .config_extra >> .config

RUN <<EOF cat >> arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
&spi0 {
Expand All @@ -90,8 +89,8 @@ RUN <<EOF cat >> arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
};
EOF

RUN sed -i 's|u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;|u-boot,spl-boot-order = "same-as-spl", \&spi0, \&sdmmc;|' \
arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
RUN sed -i.bak 's|u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;|u-boot,spl-boot-order = "same-as-spl", \&sdmmc, \&spi_flash;|' \
arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi && (! diff arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi.bak &> /dev/null)

RUN <<EOF cat >> arch/arm/dts/rk3328-nanopi-r2s.dts
&spi0 {
Expand All @@ -108,12 +107,14 @@ RUN <<EOF cat >> arch/arm/dts/rk3328-nanopi-r2s.dts
EOF

RUN <<EOF cat >> drivers/spi/rk_spi.c
DM_DRIVER_ALIAS(rockchip_rk3288_spi, rockchip_rk3328_spi);
DM_DRIVER_ALIAS(rockchip_rk3288_spi, rockchip_rk3328_spi)
EOF

RUN sed -i 's|[BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000",|[BROM_BOOTSOURCE_SPINOR] "/spi@ff190000", [BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000",|' arch/arm/mach-rockchip/rk3328/rk3328.c
RUN sed -i.bak 's|\[BROM_BOOTSOURCE_EMMC\] = "/mmc@ff520000",|[BROM_BOOTSOURCE_SPINOR] "/spi@ff190000", [BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000",|' \
arch/arm/mach-rockchip/rk3328/rk3328.c && (! diff arch/arm/mach-rockchip/rk3328/rk3328.c arch/arm/mach-rockchip/rk3328/rk3328.c.bak)

RUN sed -i 's|uclass_get_device_by_of_offset(UCLASS_SPI_FLASH|uclass_get_device_by_of_offset(UCLASS_SPI_FLASH|' arch/arm/mach-rockchip/spl-boot-order.c
RUN sed -i.bak 's|uclass_get_device_by_of_offset(UCLASS_SPI_FLASH|uclass_get_device_by_of_offset(UCLASS_SPI|g' \
arch/arm/mach-rockchip/spl-boot-order.c && (! diff arch/arm/mach-rockchip/spl-boot-order.c arch/arm/mach-rockchip/spl-boot-order.c.bak)

COPY --from=trust /arm-trusted-firmware/build/rk3328/release/bl31/bl31.elf /

Expand All @@ -123,7 +124,15 @@ RUN BL31=/bl31.elf make CROSS_COMPILE=aarch64-linux-gnu- all -j4

RUN ./tools/mkimage -n rk3328 -T rksd -d tpl/u-boot-tpl.bin idbloader.img

RUN make CROSS_COMPILE=aarch64-linux-gnu- u-boot.itb
# Uncomment this to enable debug logging in U-Boot final stage:
#RUN <<EOF cat >> .config
#CONFIG_LOG=y
#CONFIG_LOGLEVEL=10
#EOF
#COPY uboot_debug.patch /uboot_debug.patch
#RUN patch -p1 < /uboot_debug.patch

RUN BL31=/bl31.elf make CROSS_COMPILE=aarch64-linux-gnu- u-boot.itb

###############################################################################

Expand All @@ -133,12 +142,14 @@ COPY --from=u-boot /u-boot/idbloader.img /
COPY --from=u-boot /u-boot/spl/u-boot-spl.bin /
COPY --from=u-boot /u-boot/u-boot.itb /

# Note: we write u-boot.itb twice, because on SD card
# it will be searched for at block 16384
RUN \
cat idbloader.img > newidb.img && \
cat u-boot-spl.bin >> newidb.img && \
truncate -s 229376 newidb.img && \
cat u-boot.itb >> newidb.img && \
dd if=/dev/zero of=zero32k.bin bs=32768 count=1 && \
cat zero32k.bin > idb_finish.img && \
cat newidb.img >> idb_finish.img

cat newidb.img >> idb_finish.img && \
dd if=u-boot.itb of=idb_finish.img bs=512 seek=16384
17 changes: 12 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,12 @@ Note: above will work, but limits access to only first 16Mb of 32Mb SPI Flash.
Configure and patch files of the mainline U-boot
================================================

1. Download latest U-Boot from https://github.com/u-boot/u-boot
1. Download latest U-Boot from https://github.com/u-boot/u-boot and switch into to a some well-working release branch:

```
git clone --depth 1 https://source.denx.de/u-boot/u-boot.git
git clone https://source.denx.de/u-boot/u-boot.git
cd u-boot
git checkout v2023.01
```

2. Compile ARM Trusted Platform for RK3328
Expand Down Expand Up @@ -116,11 +117,11 @@ CONFIG_ROCKCHIP_SPI=y
};
```

* Edit the same file and add &spi0 node to boot-order:
* Edit the same file and add &spi_flash node to boot-order (put it last, if you want to allow recovery from SD card):

```
chosen {
u-boot,spl-boot-order = "same-as-spl", &spi0, &sdmmc;
u-boot,spl-boot-order = "same-as-spl", &sdmmc, &spi_flash;
};
```

Expand All @@ -143,7 +144,7 @@ chosen {
8. Fix RockChip SPI Driver `drivers/spi/rk_spi.c` and add at the end:

```
DM_DRIVER_ALIAS(rockchip_rk3288_spi, rockchip_rk3328_spi);
DM_DRIVER_ALIAS(rockchip_rk3288_spi, rockchip_rk3328_spi)
```

9. Fix boot device in Uboot RK3328 code:
Expand Down Expand Up @@ -244,6 +245,12 @@ cat zero32k.bin > idb_finish.img
cat newidb.img >> idb_finish.img
```

6. Write `u-boot.itb` again, because on SD card it will be searched for at block 16384:

```
dd if=u-boot.itb of=idb_finish.img bs=512 seek=16384
```

The resulting image is prepared in file `idb_finish.img`.

Write the SPI image to the SPI Flash chip
Expand Down
13 changes: 13 additions & 0 deletions uboot_debug.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/include/common.h b/include/common.h
index 25c317f443..ee7daaeaef 100644
--- a/include/common.h
+++ b/include/common.h
@@ -12,6 +12,8 @@
#ifndef __COMMON_H_
#define __COMMON_H_ 1

+#define LOG_DEBUG
+
#ifndef __ASSEMBLY__ /* put C only stuff in this section */
#include <config.h>
#include <errno.h>