rockchip: spl: Fix bootargs append support for kernel boot

Change-Id: I4a0aea5587a70544b66493dc343c9a36a6c4731e
Signed-off-by: Xuhui Lin <xuhui.lin@rock-chips.com>

rockchip: spl: Change spl_fdt_fixup_memory to weak func

Support implement spl_fdt_fixup_memory based on board specific needs.

Change-Id: Ib7074d9339387bd251ca0839074e21e13a6d09bf
Signed-off-by: Xuh

rockchip: spl: Change spl_fdt_fixup_memory to weak func

Support implement spl_fdt_fixup_memory based on board specific needs.

Change-Id: Ib7074d9339387bd251ca0839074e21e13a6d09bf
Signed-off-by: Xuhui Lin <xuhui.lin@rock-chips.com>

show more ...

common: spl: Deliver aarch32 params based on uboot.itb

Change-Id: I0713c2cb11c43e33311e91f895c3bb465f5782a0
Signed-off-by: Xuhui Lin <xuhui.lin@rock-chips.com>

common: spl: Add HW-ID dtb support for thunderboot

Steps to enable HW-ID dtb on thunderboot:
1、configs: Enable the following configurations:
CONFIG_SPL_ROCKCHIP_HWID_DTB
CONFIG

common: spl: Add HW-ID dtb support for thunderboot

Steps to enable HW-ID dtb on thunderboot:
1、configs: Enable the following configurations:
CONFIG_SPL_ROCKCHIP_HWID_DTB
CONFIG_ADC
CONFIG_SPL_ADC_SUPPORT
CONFIG_SARADC_ROCKCHIP_V2 or CONFIG_SARADC_ROCKCHIP
2、dts: add u-boot,dm-spl on saradc node
3、Add HW-ID description for packaging boot.img:
+ #_saradc_ch1_10 {
+ data = /incbin/("/home/nickey/211/3562_dict/sdk/kernel/arch/arm64/boot/dts/rockchip/rk3562-y03-v10.dtb");
+ type = "flat_dt";
+ arch = "arm64";
+ compression = "none";
+ load = <0x208000>;
+ hash {
+ algo = "sha256";
+ };
+ };
+
kernel {
data = /incbin/("@KERNEL_IMG@");
type = "kernel";
@@ -43,7 +55,7 @@
conf {
description = "Boot Linux kernel with FDT blob";
rollback-index = <0x0>;
- fdt = "fdt";
+ fdt = "#_saradc_ch1_10", "fdt";
kernel = "kernel";
signature {

Tested-On: RK3562
Change-Id: If38f49296f1073e69262da21b5502b1437eb2744
Signed-off-by: Xuhui Lin <xuhui.lin@rock-chips.com>
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

show more ...

env: envf: refactor code to read env partition table directly

The partition table list should not depend on other procedure,
eg. pre-init or env variables, etc. Otherwise:

- The "part list mmc 1" i

env: envf: refactor code to read env partition table directly

The partition table list should not depend on other procedure,
eg. pre-init or env variables, etc. Otherwise:

- The "part list mmc 1" is wrong which uses part list from mmc 0;
- SPL may use sdmmc part list but not eMMC when try boot.
- Maybe ...

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I311a42a5c2122dcc5fad76ad2ff7b951543b46f9

show more ...

spl: support bring up kernel with macro CONFIG_SPL_KERNEL_BOOT

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Icdf16172a197d04627c1cb396cc5feb3723e0dbf

spl: atf: pass fdt info to atf through spl_image->fdt_addr

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9a980a4bda95f1b0e3b5171c52b33adcfdf5bb65

env: envf: optimise/update

- Rename "bootargs_envf" to "sys_bootargs"
- Use CONFIG_ENV_OFFSET to find ENVF data
- Hashtable: don't remove variables which were not considered
- Split envf and nowhere

env: envf: optimise/update

- Rename "bootargs_envf" to "sys_bootargs"
- Use CONFIG_ENV_OFFSET to find ENVF data
- Hashtable: don't remove variables which were not considered
- Split envf and nowhere
- Add SPL support
- Init partition table before any partition query.

Important: Must call part_init() to reinit system partition tables
after mtdparts/blkdevparts parsed.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I89623b2067108040eca1ee0f5e6f7519ebc3c42a

show more ...

spl: mmc: extern spl_mmc_find_device()

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I27dc7a5332c10f637325d8d7225e79a7018cec7d

spl: fit: use CONFIG_SPL_KERNEL_BOOT for thunder-boot

This option was added by RKFW boot flow, let's reuse it.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id4625a783747ce2e4ebaf69

spl: fit: use CONFIG_SPL_KERNEL_BOOT for thunder-boot

This option was added by RKFW boot flow, let's reuse it.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id4625a783747ce2e4ebaf69a5fa3812077a79639

show more ...

spl: fit: support load kernel fit

Support load kernel fit image from boot/recovery partition
and ignore U-Boot proper if we expect to boot kernel in SPL.

Signed-off-by: Joseph Chen <chenjh@rock-chi

spl: fit: support load kernel fit

Support load kernel fit image from boot/recovery partition
and ignore U-Boot proper if we expect to boot kernel in SPL.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I220c70c784e2327feea591756cbbde97ada8335f

show more ...

spl: remove unused variable "rollback_index"

We prefer use "gd->rollback_index".

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I45bc64e38224064797d8d8bd89d9d3881f8793b5

Merge branch 'next-dev' into thunder-boot

fit: add rollback index protect support

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3af0049532d7b34adadbbb1faf6c54aad6232f93

spl: do cleanup before jumping to next stage

Cache/mmu/interrupt cleanup is recommand before jumping to
next stage to avoid some uncertain things.

Provide a arch/board-specific callback to do clean

spl: do cleanup before jumping to next stage

Cache/mmu/interrupt cleanup is recommand before jumping to
next stage to avoid some uncertain things.

Provide a arch/board-specific callback to do cleanup things.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic5e4e378ec9080e7af283741370bcd9c2dc897dc

show more ...

Merge branch 'next-dev' into thunder-boot

Conflicts:
common/spl/spl_rkfw.c
drivers/pinctrl/pinctrl-rockchip.c
make.sh

Change-Id: I93f4dbe1e067c3b938bf64c4964bd5e7023b1daf
Signed-off-by: Joseph C

Merge branch 'next-dev' into thunder-boot

Conflicts:
common/spl/spl_rkfw.c
drivers/pinctrl/pinctrl-rockchip.c
make.sh

Change-Id: I93f4dbe1e067c3b938bf64c4964bd5e7023b1daf
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>

show more ...

common: spl: rkfw: support bing-up arm32 firmware

1. the arm32 trust firmware is diffirent with arm64, support it.
2. add entry_point_os to indicate the uboot or kernel entry point.

Signed-off-by:

common: spl: rkfw: support bing-up arm32 firmware

1. the arm32 trust firmware is diffirent with arm64, support it.
2. add entry_point_os to indicate the uboot or kernel entry point.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I24d1601323e99f40e81d18f1937f762b2ecc137f
(cherry picked from commit a64fd729d49f96f99e0291b10a16307d306ebb09)

Change-Id: I3b1420989d158c52259365d90011524b047b5750

show more ...

rockchip: spl: add get spl next stage driver

Use it to make sure which firmware can be bring up.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ib2cec8bf7c78fa436efade0518b07c319317

rockchip: spl: add get spl next stage driver

Use it to make sure which firmware can be bring up.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ib2cec8bf7c78fa436efade0518b07c3193170c7b

show more ...

spl: add spl next stage definition

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I822f0e92b158a673ce0d2e2265a5237f5870a58f

spl: add next_stage to struct spl_image_info

Add next_stage to indicate the next boot stage is uboot or kernel.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9104ede143c5a9c7f0bff

spl: add next_stage to struct spl_image_info

Add next_stage to indicate the next boot stage is uboot or kernel.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9104ede143c5a9c7f0bff6869e67d5e605e596ca

show more ...

common: spl: rkfw: support bing-up arm32 firmware

1. the arm32 trust firmware is diffirent with arm64, support it.
2. add entry_point_os to indicate the uboot or kernel entry point.

Signed-off-by:

common: spl: rkfw: support bing-up arm32 firmware

1. the arm32 trust firmware is diffirent with arm64, support it.
2. add entry_point_os to indicate the uboot or kernel entry point.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I24d1601323e99f40e81d18f1937f762b2ecc137f

show more ...

spl: record boot_device into spl_image and call
spl_perform_fixups

On some boards, we want to give the board/architecture-specific code a
chance to look at where the next image has been loaded from

spl: record boot_device into spl_image and call
spl_perform_fixups

On some boards, we want to give the board/architecture-specific code a
chance to look at where the next image has been loaded from and
perform fixups before starting the next image. This is of particular
importance, when we probe multiple devices for bootable payloads and
boot the first one found.

This change adds the following:
- we record the boot_device used into the spl_image structure
- we provide an extension-point for boards/architectures that can
perform late fixups depending on a fully populated spl_image
structure (i.e. we'll know the final boot_device and have info
on the image type and operating system to be booted).

Change-Id: Iebca59a61979bc12eabe743c73dc2279e870e2ff
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Tested-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>

show more ...

common: spl: atf: add bl32/bl33 entry point to struct spl_image_info

This allows other booting device to initial other firmware entry
point, but not only FIT.

Change-Id: I73b08d594079ce0842b68f1c9d

common: spl: atf: add bl32/bl33 entry point to struct spl_image_info

This allows other booting device to initial other firmware entry
point, but not only FIT.

Change-Id: I73b08d594079ce0842b68f1c9d222f58e171b555
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>

show more ...

common: spl: atf: export bl31_entry()

Change-Id: I7c628ba567ca554caa5902e6aa6592282ccf167d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>

spl: add support to booting with OP-TEE

OP-TEE is an open source trusted OS, in armv7, its loading and
running are like this:
loading:
- SPL load both OP-TEE and U-Boot
running:
- SPL run into OP-TE

spl: add support to booting with OP-TEE

OP-TEE is an open source trusted OS, in armv7, its loading and
running are like this:
loading:
- SPL load both OP-TEE and U-Boot
running:
- SPL run into OP-TEE in secure mode;
- OP-TEE run into U-Boot in non-secure mode;

More detail:
https://github.com/OP-TEE/optee_os
and search for 'boot arguments' for detail entry parameter in:
core/arch/arm/kernel/generic_entry_a32.S

Change-Id: I1344a35dd11bd69ca00e9b99909e1eb610648d86
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 32470d8ebee6a9c31a7a6b82704c486ef06cf549)

show more ...