[PATCH 1/2] rockchip: rk3308: allow loading larger kernel Image

[PATCH 1/2] rockchip: rk3308: allow loading larger kernel Image

[Andy Yan]

When compile the curren mainline linux kernel(Linux 5.5-rc3)
with defconfig, the final Image is 29M, it's much
larger than Linux 5.4.

On the current u-boot side on rk3308, the gap between
kernel and fdt is 25M, the fdt will overwrite kernel
Image, so move ftd to a higher memory to give 34M
gab for them.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
---

 include/configs/rk3308_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index a67d3d7d1b..bd9ac826f3 100644
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -42,7 +42,7 @@
 #define ENV_MEM_LAYOUT_SETTINGS \
 	"scriptaddr=0x00500000\0" \
 	"pxefile_addr_r=0x00600000\0" \
-	"fdt_addr_r=0x01f00000\0" \
+	"fdt_addr_r=0x02800000\0" \
 	"kernel_addr_r=0x00680000\0" \
 	"ramdisk_addr_r=0x04000000\0"
 
-- 
2.17.1

[PATCH 2/2] doc: rockchip: Fix reference the wrong defconfig name of ROC-CC-RK3308

[Andy Yan]

The defconfig file for ROC-CC-RK3308 is roc-cc-rk3308_defconfig.

Fixes: 7f08bfb74f04 ("doc: rockchip: Add documentation for rk3308 based
boards")

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
---

 doc/README.rockchip | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/README.rockchip b/doc/README.rockchip
index dae4ebc8e4..ffab8ff417 100644
--- a/doc/README.rockchip
+++ b/doc/README.rockchip
@@ -50,7 +50,7 @@ Two RK3036 boards are supported:
 Two RK3308 boards are supported:
 
    - EVB RK3308 - use evb-rk3308 configuration
-   - ROC-CC-RK3308 - use roc-rk3308-cc configuration
+   - ROC-CC-RK3308 - use roc-cc-rk3308 configuration
 
 Two RK3328 board are supported:
 
@@ -106,7 +106,7 @@ For example:
    - Compile U-Boot
      => cd /path/to/u-boot
      => export BL31=/path/to/rkbin/bin/rk33/rk3308_bl31_v2.22.elf
-     => make roc-rk3308-cc_defconfig
+     => make roc-cc-rk3308_defconfig
      => make CROSS_COMPILE=aarch64-linux-gnu- all
      => ./tools/mkimage -n rk3308 -T rksd -d /path/to/rkbin/bin/rk33/rk3308_ddr_589MHz_uart2_m0_v1.26.bin idbloader.img
      => cat spl/u-boot-spl.bin  >> idbloader.img
-- 
2.17.1

[PATCH 1/2] rockchip: rk3308: allow loading larger kernel Image

[Kever Yang]

On 2019/12/26 下午3:20, Andy Yan wrote:
> When compile the curren mainline linux kernel(Linux 5.5-rc3)
> with defconfig, the final Image is 29M, it's much
> larger than Linux 5.4.
>
> On the current u-boot side on rk3308, the gap between
> kernel and fdt is 25M, the fdt will overwrite kernel
> Image, so move ftd to a higher memory to give 34M
> gab for them.
>
> Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>
>   include/configs/rk3308_common.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
> index a67d3d7d1b..bd9ac826f3 100644
> --- a/include/configs/rk3308_common.h
> +++ b/include/configs/rk3308_common.h
> @@ -42,7 +42,7 @@
>   #define ENV_MEM_LAYOUT_SETTINGS \
>   	"scriptaddr=0x00500000\0" \
>   	"pxefile_addr_r=0x00600000\0" \
> -	"fdt_addr_r=0x01f00000\0" \
> +	"fdt_addr_r=0x02800000\0" \
>   	"kernel_addr_r=0x00680000\0" \
>   	"ramdisk_addr_r=0x04000000\0"
>   

[PATCH 2/2] doc: rockchip: Fix reference the wrong defconfig name of ROC-CC-RK3308

[Kever Yang]

On 2019/12/26 下午3:20, Andy Yan wrote:
> The defconfig file for ROC-CC-RK3308 is roc-cc-rk3308_defconfig.
>
> Fixes: 7f08bfb74f04 ("doc: rockchip: Add documentation for rk3308 based
> boards")
>
> Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>
>   doc/README.rockchip | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/doc/README.rockchip b/doc/README.rockchip
> index dae4ebc8e4..ffab8ff417 100644
> --- a/doc/README.rockchip
> +++ b/doc/README.rockchip
> @@ -50,7 +50,7 @@ Two RK3036 boards are supported:
>   Two RK3308 boards are supported:
>   
>      - EVB RK3308 - use evb-rk3308 configuration
> -   - ROC-CC-RK3308 - use roc-rk3308-cc configuration
> +   - ROC-CC-RK3308 - use roc-cc-rk3308 configuration
>   
>   Two RK3328 board are supported:
>   
> @@ -106,7 +106,7 @@ For example:
>      - Compile U-Boot
>        => cd /path/to/u-boot
>        => export BL31=/path/to/rkbin/bin/rk33/rk3308_bl31_v2.22.elf
> -     => make roc-rk3308-cc_defconfig
> +     => make roc-cc-rk3308_defconfig
>        => make CROSS_COMPILE=aarch64-linux-gnu- all
>        => ./tools/mkimage -n rk3308 -T rksd -d /path/to/rkbin/bin/rk33/rk3308_ddr_589MHz_uart2_m0_v1.26.bin idbloader.img
>        => cat spl/u-boot-spl.bin  >> idbloader.img