diff options
author | Tom Rini <trini@konsulko.com> | 2017-09-18 19:44:57 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-09-18 19:44:57 (GMT) |
commit | 975f97b43181694041f77ecd8118364afe588144 (patch) | |
tree | 16500994985d434314427ea0033b5db1751e637f /board | |
parent | 45d19acb2f340a3a8092cedcdef01d3e9efb8342 (diff) | |
parent | 60d7c50945d65185a5c86c4f52d4671fb59292e3 (diff) | |
download | u-boot-975f97b43181694041f77ecd8118364afe588144.tar.xz |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'board')
-rw-r--r-- | board/amarula/vyasa-rk3288/Kconfig | 12 | ||||
-rw-r--r-- | board/amarula/vyasa-rk3288/MAINTAINERS | 6 | ||||
-rw-r--r-- | board/amarula/vyasa-rk3288/Makefile | 7 | ||||
-rw-r--r-- | board/amarula/vyasa-rk3288/vyasa-rk3288.c | 7 | ||||
-rw-r--r-- | board/theobroma-systems/lion_rk3368/README | 24 | ||||
-rw-r--r-- | board/theobroma-systems/puma_rk3399/README | 51 | ||||
-rw-r--r-- | board/theobroma-systems/puma_rk3399/puma-rk3399.c | 2 |
7 files changed, 98 insertions, 11 deletions
diff --git a/board/amarula/vyasa-rk3288/Kconfig b/board/amarula/vyasa-rk3288/Kconfig new file mode 100644 index 0000000..8b8c308 --- /dev/null +++ b/board/amarula/vyasa-rk3288/Kconfig @@ -0,0 +1,12 @@ +if TARGET_VYASA_RK3288 + +config SYS_BOARD + default "vyasa-rk3288" + +config SYS_VENDOR + default "amarula" + +config SYS_CONFIG_NAME + default "vyasa-rk3288" + +endif diff --git a/board/amarula/vyasa-rk3288/MAINTAINERS b/board/amarula/vyasa-rk3288/MAINTAINERS new file mode 100644 index 0000000..10397fc --- /dev/null +++ b/board/amarula/vyasa-rk3288/MAINTAINERS @@ -0,0 +1,6 @@ +VYASA RK3288 +M: Jagan Teki <jagan@amarulasolutions.com> +S: Maintained +F: board/amarula/vyasa-rk3288 +F: include/configs/vyasa-rk3288.h +F: configs/vyasa-rk3288_defconfig diff --git a/board/amarula/vyasa-rk3288/Makefile b/board/amarula/vyasa-rk3288/Makefile new file mode 100644 index 0000000..7c0d5c0 --- /dev/null +++ b/board/amarula/vyasa-rk3288/Makefile @@ -0,0 +1,7 @@ +# +# Copyright (C) 2017 Amarula Solutions +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += vyasa-rk3288.o diff --git a/board/amarula/vyasa-rk3288/vyasa-rk3288.c b/board/amarula/vyasa-rk3288/vyasa-rk3288.c new file mode 100644 index 0000000..ceee42c --- /dev/null +++ b/board/amarula/vyasa-rk3288/vyasa-rk3288.c @@ -0,0 +1,7 @@ +/* + * Copyright (C) 2017 Amarula Solutions + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> diff --git a/board/theobroma-systems/lion_rk3368/README b/board/theobroma-systems/lion_rk3368/README index 47304fc..83e4332 100644 --- a/board/theobroma-systems/lion_rk3368/README +++ b/board/theobroma-systems/lion_rk3368/README @@ -26,12 +26,32 @@ Build the full U-Boot and a FIT image including the ATF > make CROSS_COMPILE=aarch64-unknown-elf- ARCH=arm u-boot.itb -Write to a SD-card -================== +Flash the image +=============== + +Copy the SPL to offset 32k and the FIT image containing the payloads +(U-Boot proper, ATF, devicetree) to offset 256k card. + +SD-Card +------- > dd if=spl-3368.img of=/dev/sdb seek=64 > dd if=u-boot.itb of=/dev/sdb seek=512 +eMMC +---- + +rkdeveloptool allows to flash the on-board eMMC via the USB OTG interface with +help of the Rockchip loader binary. + + > git clone https://github.com/rockchip-linux/rkdeveloptool + > cd rkdeveloptool + > autoreconf -i && && ./configure && make + > git clone https://github.com/rockchip-linux/rkbin.git + > ./rkdeveloptool db rkbin/rk33/rk3368_loader_v2.00.256.bin + > ./rkdeveloptool wl 64 ../spl.img + > ./rkdeveloptool wl 512 ../u-boot.itb + If everything went according to plan, you should see the following output on UART0: diff --git a/board/theobroma-systems/puma_rk3399/README b/board/theobroma-systems/puma_rk3399/README index 214281a..f67dfb4 100644 --- a/board/theobroma-systems/puma_rk3399/README +++ b/board/theobroma-systems/puma_rk3399/README @@ -55,18 +55,53 @@ Compile the U-Boot Package the image ================= - > tools/mkimage -n rk3399 -T rksd -d spl/u-boot-spl.bin spl.img - > make CROSS_COMPILE=aarch64-linux-gnu- u-boot.itb +Creating a SPL image for SD-Card/eMMC + > tools/mkimage -n rk3399 -T rksd -d spl/u-boot-spl.bin spl_mmc.img +Creating a SPL image for SPI-NOR + > tools/mkimage -n rk3399 -T rkspi -d spl/u-boot-spl.bin spl_nor.img +Create the FIT image containing U-Boot proper, ATF, M0 Firmware, devicetree + > make CROSS_COMPILE=aarch64-linux-gnu- u-boot.itb Flash the image =============== -Copy the SPL to offset 32k and the FIT image containing the payloads -(U-Boot proper, ATF, M0 Firmware, devicetree) to offset 256k on a SD -card. +Copy the SPL to offset 32k for SD/eMMC, offset 0 for NOR-Flash and the FIT +image to offset 256k card. - > dd if=spl.img of=/dev/sdb seek=64 +SD-Card +------- + + > dd if=spl_mmc.img of=/dev/sdb seek=64 > dd if=u-boot.itb of=/dev/sdb seek=512 -After powering up the board (with the inserted SD card), you should see -a U-Boot console on UART0 (115200n8). +eMMC +---- + +rkdeveloptool allows to flash the on-board eMMC via the USB OTG interface with +help of the Rockchip loader binary. + + > git clone https://github.com/rockchip-linux/rkdeveloptool + > cd rkdeveloptool + > autoreconf -i && ./configure && make + > git clone https://github.com/rockchip-linux/rkbin.git + > ./rkdeveloptool db rkbin/rk33/rk3399_loader_v1.08.106.bin + > ./rkdeveloptool wl 64 ../spl_mmc.img + > ./rkdeveloptool wl 512 ../u-boot.itb + +NOR-Flash +--------- + +Writing the SPI NOR Flash requires a running U-Boot. For the sake of simplicity +we assume you have a SD-Card with a partition containing the required files +ready. + + > load mmc 1:1 ${kernel_addr_r} spl_nor.img + > sf probe + > sf erase 0 +$filesize + > sf write $kernel_addr_r 0 ${filesize} + > load mmc 1:1 ${kernel_addr_r} u-boot.itb + > sf erase 0x40000 +$filesize + > sf write $kernel_addr_r 0x40000 ${filesize} + + +Reboot the system and you should see a U-Boot console on UART0 (115200n8). diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index c6f8eed..45d56cd 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -107,7 +107,7 @@ static void setup_serial(void) u8 low[cpuid_length/2], high[cpuid_length/2]; char cpuid_str[cpuid_length * 2 + 1]; u64 serialno; - char serialno_str[16]; + char serialno_str[17]; /* retrieve the device */ ret = uclass_get_device_by_driver(UCLASS_MISC, |