Commit Graph

54 Commits

Author SHA1 Message Date
Tianling Shen
dfc3b62282
uboot-rockchip: add OrangePi R1 Plus LTS support
Add support for the Xunlong OrangePi R1 Plus LTS.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-02-13 20:34:48 +08:00
Tianling Shen
cf49626f45
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-10-12 14:39:40 +08:00
Adrian Schmutzler
91eed5d9fb rockchip: rename "Rock Pi 4" to "Rock Pi 4A"
Kernel has added the different variants of the Rock Pi 4 in commit
b5edb0467370 ("arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a
dts"). The former Rock Pi 4 is now Rock Pi 4A.

For compatibility with kernel 5.4, this rename has been held back
so far. Having switched to kernel 5.10 now, we can finally apply
it in our tree as well.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2021-10-10 00:57:56 +02:00
Tianling Shen
9d8fe8614b
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-10-04 09:33:43 +08:00
Adrian Schmutzler
53d19bb8cf treewide: use AUTORELEASE on all uboot-* packages
Nobody ever updates PKG_RELEASE when changing devices or setup in
the various uboot-* packages. Use $(AUTORELEASE) so we still have
proper versioning there.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2021-10-02 21:26:12 +02:00
Tianling Shen
71813d23c5
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-08-18 19:44:35 +08:00
Tianling Shen
c47830861c
uboot-rockchip: fix typo error of patch name
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 301489a8d9)
2021-08-15 18:08:50 +08:00
David Bauer
e68e80ead9 uboot-rockchip: update to v2021.07
Tested on NanoPi R2S

Signed-off-by: David Bauer <mail@david-bauer.net>
2021-08-15 01:23:55 +02:00
Tianling Shen
3688d52547
uboot-rockchip: add NanoPi R2C support
Add support for the FriendlyARM NanoPi R2C.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 2f1747a51f)
2021-08-13 03:23:31 +08:00
Tianling Shen
4262a83d1d
arm-trusted-firmware-rockchip-vendor: rework multiple devices building
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-08-12 23:54:14 +08:00
Tianling Shen
03c5732509
uboot-rockchip: fix dependencies
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 052f3e3c61)
2021-08-08 22:09:14 +08:00
Tianling Shen
2696d3d4a2
uboot-rockchip: fix merge conflict
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-08-08 20:26:10 +08:00
Tianling Shen
bd3df9f3ce
uboot-rockchip: drop ugly hacks from friendlyarm
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 974443992e)
2021-08-08 20:23:29 +08:00
Tianling Shen
ffad2f5a30
uboot-rockchip: use rkbin for nanopi r4s
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit a2759b1be2)
2021-08-08 20:23:13 +08:00
Tianling Shen
97543a7b85
arm-trusted-firmware-rkbin: rename from arm-trusted-firmware-rk3328
Added support for rk3399.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 87fe3f8257)
2021-08-08 20:22:55 +08:00
AmadeusGhost
4104945469
arm-trusted-firmware-rk3328: update to latest git HEAD
Signed-off-by: AmadeusGhost <amadeus@immortalwrt.org>
(cherry picked from commit 1c3cf01b93)
2021-06-16 17:37:18 +08:00
Tianling Shen
8ec83daf55
rockchip: fix merge conflict
Remove duplicated patches.

Fixes: c3b76adcb0 ("Merge Official Source")

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-06-14 21:33:06 +08:00
Tianling Shen
c3b76adcb0
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-06-14 21:17:25 +08:00
Tianling Shen
52dc7995f7 uboot-rockchip: add NanoPi R4S support
Add support for the FriendlyARM NanoPi R4S.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-06-10 10:34:44 +02:00
AmadeusGhost
e0d536a287
uboot-rockchip: orangepi-r1-plus: refresh precompiled files
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-21 20:08:43 +08:00
Tianling Shen
78da830b95
uboot-rockchip: nanopi4: move new files out of patch
Since these files could never go to upstream, it's meaningless to
keep them in a single patch.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-21 14:58:58 +08:00
Tianling Shen
fb3bac8f37
uboot-rockchip: nanopi4: rename DM_GET_DRIVER to DM_DRIVER_GET
Upstream commit: u-boot/u-boot@65e25bea59 ("dm: Rename DM_GET_DRIVER() to DM_DRIVER_GET()")

Fixes: #364

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-21 14:36:09 +08:00
AmadeusGhost
290eb0245c
uboot-rockchip: refresh patches
Fix: #364
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-21 14:35:56 +08:00
Tianling Shen
4baddb365a
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-21 14:35:27 +08:00
David Bauer
b832ebb886 uboot-rockchip: update to v2021.04
Update the uboot-rockchip to the latest upstream release.
Remove upstreamed patches.

Tested-on: FriendlyElec NanoPi R2S

Signed-off-by: David Bauer <mail@david-bauer.net>
2021-04-20 13:15:45 +02:00
AmadeusGhost
4dfd4f2e4c
rockchip: orangepi-r1-plus: typo fixes
This affects nothing, just correct the format.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-08 22:49:24 +08:00
AmadeusGhost
65bdd1f5a7
rockchip: add support for OrangePi R1 Plus
Hardware Specification:
  CPU: RockChip RK3328 (4 cores)
  RAM: 1GB DDR4
  Ethernet: 2x 1000 Base-T
  Flash: SPI-NOR 16 MB (mx25l12835f)
  LED: SYS, LAN, WAN
  MicroSD Slot x 1
  Button: Reset
  USB:1x 2.0
  Serial1: 13 Pin pin-header
  Serial2: 3 Pin debug port
  Type-C: for power input
  Power Supply: DC 5V/2A

Installation:
  Write the image to SD Card with dd.

Signed-off-by: AmadeusGhost <amadeus@jmu.edu.cn>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-29 23:36:46 +08:00
Tianling Shen
7c5950fef2
rockchip: nanopi-r4s: refresh latest patches accepted by upstream
Link: https://lore.kernel.org/r/20210319051627.814-2-cnsztl@gmail.com
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-22 19:56:50 +08:00
Tianling Shen
f6695f655a
uboot-rockchip: fix build with rkbin
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-07 19:46:10 +08:00
AmadeusGhost
d6e8809097
uboot-rockchip: add support for building with rockchip ddrloader
Referred to http://opensource.rock-chips.com/wiki_Boot_option#Boot_flow.

Signed-off-by: AmadeusGhost <amadeus@immortalwrt.org>
[fixed format issue]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-07 17:13:51 +08:00
CN_SZTL
45f1463e86
Merge Official Source
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-02-02 23:41:15 +08:00
Marty Jones
1735026632 uboot-rockchip: fix RockPro64 boot from eMMC
With upstream commit f81f9f0ebac5 ("rockchip: rockpro64: initialize USB in
preboot") CONFIG_USE_PREBOOT was enabled on the RockPro64, which is causing
boot issues when a eMMC is used, as a workaround will temporarily disable
this option.

Signed-off-by: Marty Jones <mj8263788@gmail.com>
[Improve patch description]
Signed-off-by: David Bauer <mail@david-bauer.net>
2021-02-01 00:48:06 +01:00
CN_SZTL
b65bd6d007
Merge Official Source 2021-01-16 17:29:29 +08:00
David Bauer
3c20768bb9 uboot-rockchip: update NanoPi R2S patches
Update the NanoPi R2S to the latest version submitted
upstream.

Signed-off-by: David Bauer <mail@david-bauer.net>
2021-01-14 01:03:48 +01:00
Marty Jones
d567a24200 uboot-rockchip: update to v2021.01
Update the U-Boot to version v2021.01.

Run-tested: FriendlyARM NanoPi R2S
            Radxa Rock Pi 4
            Pine64 RockPro64

Signed-off-by: Marty Jones <mj8263788@gmail.com>
[format commit message]
Signed-off-by: David Bauer <mail@david-bauer.net>
2021-01-14 01:03:41 +01:00
CN_SZTL
1d99824efc
rockchip: improve support for NanoPi R4S
- enable sd ultra-high speeds
- format style

Fixes: cd7fd0c77b ("rockchip: add NanoPi R4S support")

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-09 16:46:14 +08:00
CN_SZTL
474a479c37
uboot-rockchip: refresh patches
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-02 11:49:29 +08:00
David Bauer
1bf00a8526
uboot-rockchip: update to v2020.10
Update to the latest U-Boot release. Refresh patches for the NanoPi R2S
to include the latest DTS accepted Linux upstream.

Signed-off-by: David Bauer <mail@david-bauer.net>
2021-01-02 11:48:36 +08:00
Tianling Shen
a599926a53 uboot-rockchip: add NanoPi R4S support
Add support for the FriendlyARM NanoPi R4S.

Signed-off-by: Tianling Shen <cnsztl@gmail.com>
Co-authored-by: Jensen Huang <jensenhuang@friendlyarm.com>
Signed-off-by: Jensen Huang <jensenhuang@friendlyarm.com>
Co-authored-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Marty Jones <mj8263788@gmail.com>
2020-12-27 14:00:31 +08:00
CN_SZTL
0f6392c262
Merge Official Source 2020-10-04 22:23:18 +08:00
Marty Jones
6cc99c656d uboot-rockchip: add Rock Pi 4 support
Add support for the  Raxda Rock Pi 4.

Signed-off-by: Marty Jones <mj8263788@gmail.com>
2020-10-03 22:51:50 +02:00
David Bauer
ea9046d1ae Revert "uboot-rockchip: update NanoPi R2S patches"
This reverts commit bda6f6572b.

This commit breaks the onboard ethernet on some units. Revert it for
now.

Signed-off-by: David Bauer <mail@david-bauer.net>
2020-10-03 19:00:49 +02:00
CN_SZTL
53555c59ea
uboot-rockchip: fix nanopi-r2s failed to boot on some sd cards
This reverts commit 04557652dd.
2020-10-03 20:01:33 +08:00
David Bauer
97c3870bb9
Revert "uboot-rockchip: update NanoPi R2S patches"
This reverts commit bda6f6572b.

This commit breaks the onboard ethernet on some units. Revert it for
now.

Signed-off-by: David Bauer <mail@david-bauer.net>
2020-10-03 20:00:39 +08:00
CN_SZTL
04557652dd
Revert "uboot-rockchip: fix nanopi-r2s failed to boot on some sd cards"
This reverts commit 30a06b618f
and 9fbe1ea8e1.
2020-09-30 19:25:43 +08:00
CN_SZTL
26368d3355
Merge Officail Source 2020-09-30 19:25:04 +08:00
David Bauer
bda6f6572b uboot-rockchip: update NanoPi R2S patches
Update the patches required for the NanoPi R2S to match the DTS accepted
for upstream Linux. The U-Boot patch meanwhile is still pending
upstream.

Signed-off-by: David Bauer <mail@david-bauer.net>
2020-09-30 00:06:45 +02:00
CN_SZTL
9fbe1ea8e1
uboot-rockchip: drop useless defconfig for nanopi-r2s
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2020-08-20 05:04:48 +08:00
Yuan Tao
30a06b618f
uboot-rockchip: fix nanopi-r2s failed to boot on some sd cards
Add regulator-boot-on parameters to vcc_sd.
Add startup-delay-us parameters to vcc_sdio.
This will improve the problem that in some SD cards are failing to boot up.

Signed-off-by: Yuan Tao <ty@wevs.org>
2020-08-20 05:04:42 +08:00
David Bauer
04f06787f1 uboot-rockchip: add NanoPi R2S support
Add support for the FriendlyARM NanoPi R2S.

Signed-off-by: David Bauer <mail@david-bauer.net>
2020-07-28 15:52:44 +02:00