Hi Sjoerd,

On 16 August 2015 at 06:01, Sjoerd Simons sjoerd.simons@collabora.co.uk wrote:

The Radxa Rock pro board is rk3188 based and thus won't work with u-boot

Can we please use 'U-Boot' everywhere?

build for RK3288. Change the documentation to refer to the intended

s/build/built/ I think

board, the Radxa Rock 2, which is an RK3288 based design very similar to

RK3288-based

the firefly

Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk

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

Acked-by: Simon Glass sjg@chromium.org

diff --git a/doc/README.rockchip b/doc/README.rockchip index a34e198..ce8ce77 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -39,7 +39,7 @@ Building At present three RK3288 boards are supported:

- Firefly RK3288 - use firefly-rk3288 configuration

• • Radxa Rock Pro - also uses firefly-rk3288 configuration

• • Radxa Rock 2 - also uses firefly-rk3288 configuration
  • Haier Chromebook - use chromebook_jerry configuration

For example: @@ -48,8 +48,8 @@ For example:

(or you can use another cross compiler if you prefer)

-Note that the Radxa Rock Pro uses the Firefly configuration for now as -device tree files are not yet available for the Rock Pro. Clearly the two +Note that the Radxa Rock 2 uses the Firefly configuration for now as +device tree files are not yet available for the Rock 2. Clearly the two have hardware differences, so this approach will break down as more drivers are added.

-- 2.5.0

Regards, Simon

Hi Sjoerd,

On 16 August 2015 at 06:01, Sjoerd Simons sjoerd.simons@collabora.co.uk wrote:

During mmc initialize probe all devices with the MMC Uclass if build with CONFIG_DM_MMC

Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk

drivers/mmc/mmc.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index da47037..a366933 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -10,6 +10,8 @@ #include <config.h> #include <common.h> #include <command.h> +#include <dm.h> +#include <dm/device-internal.h> #include <errno.h> #include <mmc.h> #include <part.h> @@ -1759,16 +1761,38 @@ static void do_preinit(void) } }

+#if defined(CONFIG_DM_MMC) && defined(CONFIG_SPL_BUILD) +static void mmc_probe(bd_t *bis) +{ +} +#elif defined(CONFIG_DM_MMC) +static void mmc_probe(bd_t *bis)

This function should return an int error.

+{

•   int ret;
  

•   struct uclass *uc;
  

•   struct udevice *m;
  

•   uclass_get(UCLASS_MMC, &uc);
  

Please error-check this and bail if you see an error. It does sometimes happen that someone disables enough options that a uclass is missing, and we want to fail gracefully.

•   uclass_foreach_dev(m, uc) {
  

•           ret = device_probe(m);
  

•           if (ret)
  

•                   printf("%s - probe failed: %d\n", m->name, ret);
  

•   }
  

+} +#else +static void mmc_probe(bd_t *bis) +{

•   if (board_mmc_init(bis) < 0)
  

•           cpu_mmc_init(bis);
  

+} +#endif

int mmc_initialize(bd_t *bis) { INIT_LIST_HEAD (&mmc_devices); cur_dev_num = 0;

-#ifndef CONFIG_DM_MMC

•   if (board_mmc_init(bis) < 0)
  

•           cpu_mmc_init(bis);
  

-#endif

•   mmc_probe(bis);
  

Error check

#ifndef CONFIG_SPL_BUILD print_mmc_devices(','); -- 2.5.0

BTW please see an earlier patch:

http://patchwork.ozlabs.org/patch/501315/

which seems to do a similar thing.

Regards, Simon

Hi Sjoerd,

On 16 August 2015 at 06:01, Sjoerd Simons sjoerd.simons@collabora.co.uk wrote:

u-boot can't use the sdio card so turn it of to prevent things getting

U-Boot

confused/struck when trying to use the card as storage.

Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk

arch/arm/dts/rk3288-firefly.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Simon Glass sjg@chromium.org

diff --git a/arch/arm/dts/rk3288-firefly.dtsi b/arch/arm/dts/rk3288-firefly.dtsi index 8a083f0..5aec1b8 100644 --- a/arch/arm/dts/rk3288-firefly.dtsi +++ b/arch/arm/dts/rk3288-firefly.dtsi @@ -386,7 +386,7 @@ pinctrl-names = "default"; pinctrl-0 = <&sdio0_bus4>, <&sdio0_cmd>, <&sdio0_clk>; vmmc-supply = <&vcc_18>;

•   status = "okay";
  

•   status = "disabled";
  

};

&sdmmc {

2.5.0

Regards, Simon

Hi Sjoerd,

On 16 August 2015 at 06:01, Sjoerd Simons sjoerd.simons@collabora.co.uk wrote:

Now that MMC works in u-boot add config distro command support to start

U-Boot

Linux in a standard fashion. One oddity here is that linux fails to load

fails to load *when* the fdt? I'm not sure but these seems to be a missing word.

the fdt is relocated to above 512MB, so set fdt_high to make sure it's loaded below that.

Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk

include/configs/rk3288_common.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)

Acked-by: Simon Glass sjg@chromium.org

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 081c62d..7781dc3 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -96,6 +96,27 @@

#ifndef CONFIG_SPL_BUILD #include <config_distro_defaults.h>

+#define ENV_MEM_LAYOUT_SETTINGS \

•   "scriptaddr=0x00000000\0" \
  

•   "pxefile_addr_r=0x00100000\0" \
  

•   "fdt_addr_r=0x01f00000\0" \
  

•   "kernel_addr_r=0x02000000\0" \
  

•   "ramdisk_addr_r=0x04000000\0"
  

+/* First try to boot from SD (index 0), then eMMC (index 1 */ +#define BOOT_TARGET_DEVICES(func) \

•   func(MMC, mmc, 0) \
  

•   func(MMC, mmc, 1)
  

+#include <config_distro_bootcmd.h>

+/* Linux fails to load the fdt if it's loaded above 512M on a Rock 2 board, so

• • limit the fdt reallocation to that */

+#define CONFIG_EXTRA_ENV_SETTINGS \

•   "fdt_high=0x1fffffff\0" \
  

•   ENV_MEM_LAYOUT_SETTINGS \
  

•   BOOTENV
  

#endif

#endif

2.5.0

Regards, Simon

Hi Sjoerd,

On 16 August 2015 at 06:01, Sjoerd Simons sjoerd.simons@collabora.co.uk wrote:

Booting the kernel fails on RK3288 (and probably other rockchip SoCs) when the i-cache is disabled/flushed before d-cache.

I have not investigated whether this is due to u-boot hanging or whether

U-Boot

it's very early in the linux boot, but following the approach of the varoius rockchip u-boot forks (first disable d-cache then i-cache) makes

various

U-Boot

things work.

Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk

arch/arm/cpu/armv7/cpu.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)

Reviewed-by: Simon Glass sjg@chromium.org

It would be good to get other reviews (e.g. Albert and Tom) to look at this one.

diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c index 0b0e500..6eac5ef 100644 --- a/arch/arm/cpu/armv7/cpu.c +++ b/arch/arm/cpu/armv7/cpu.c @@ -36,12 +36,6 @@ int cleanup_before_linux_select(int flags) disable_interrupts(); #endif

•   /*
  

•    * Turn off I-cache and invalidate it
  

•    */
  

•   icache_disable();
  

•   invalidate_icache_all();
  

•   if (flags & CBL_DISABLE_CACHES) {
            /*
            * turn off D-cache
  

@@ -61,7 +55,16 @@ int cleanup_before_linux_select(int flags) * to avoid coherency problems for kernel */ invalidate_dcache_all();

•           icache_disable();
  

•           invalidate_icache_all();
    } else {
  

•           /*
  

•            * Turn off I-cache and invalidate it
  

•            */
  

•           icache_disable();
  

•           invalidate_icache_all();
  

•           flush_dcache_all();
            invalidate_icache_all();
            icache_enable();
  

-- 2.5.0

Regards, Simon

Hi Sjoerd,

On 16 August 2015 at 06:01, Sjoerd Simons sjoerd.simons@collabora.co.uk wrote:

Instead of creating a rockchip SPL sd card image with 32Kb of zeros

SD

(I'm fine with lower case also, but please be consistent)

which can be written to the start of an SD card, create the images with only the useful data that should be written to an offset of 32Kb on the

KB I think, since Kb means Kbits in my book.

SD card.

The first 32 kilobytes aren't needed for bootup and only serve as convenient way of accidentally obliterating your partition table.

Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk

doc/README.rockchip | 2 +- tools/rksd.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-)

Acked-by: Simon Glass sjg@chromium.org

Yes I think this is a better approach.

diff --git a/doc/README.rockchip b/doc/README.rockchip index ce8ce77..347fc05 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -90,7 +90,7 @@ Booting from an SD card To write an image that boots from an SD card (assumed to be /dev/sdc):

./firefly-rk3288/tools/mkimage -T rksd -d firefly-rk3288/spl/u-boot-spl-dtb.bin out

• sudo dd if=out of=/dev/sdc

• sudo dd if=out of=/dev/sdc seek=64 sudo dd if=firefly-rk3288/u-boot-dtb.img of=/dev/sdc seek=256

This puts the Rockchip header and SPL image first and then places the U-Boot diff --git a/tools/rksd.c b/tools/rksd.c index 2efcd68..a8dbe98 100644 --- a/tools/rksd.c +++ b/tools/rksd.c @@ -14,9 +14,7 @@ #include "rkcommon.h"

enum {

•   RKSD_HEADER0_START      = 64 * RK_BLK_SIZE,
  

•   RKSD_SPL_HDR_START      = RKSD_HEADER0_START +
  

•                                   RK_CODE1_OFFSET * RK_BLK_SIZE,
  

•   RKSD_SPL_HDR_START      = RK_CODE1_OFFSET * RK_BLK_SIZE,
    RKSD_SPL_START          = RKSD_SPL_HDR_START + 4,
    RKSD_HEADER_LEN         = RKSD_SPL_START,
  

}; @@ -44,11 +42,8 @@ static void rksd_set_header(void *buf, struct stat *sbuf, int ifd, unsigned int size; int ret;

•   /* Zero the whole header. The first 32KB is empty */
  

•   memset(buf,  '\0',  RKSD_HEADER0_START);
  

•   size = params->file_size - RKSD_SPL_HDR_START;
  

•   ret = rkcommon_set_header(buf + RKSD_HEADER0_START, size);
  

•   ret = rkcommon_set_header(buf, size);
    if (ret) {
            /* TODO(sjg@chromium.org): This method should return an error */
            printf("Warning: SPL image is too large (size %#x) and will not boot\n",
  

-- 2.5.0

Regards, Simon

Hi Sjoerd,

On 16 August 2015 at 06:01, Sjoerd Simons sjoerd.simons@collabora.co.uk wrote:

MMC support works now, so it can be dropped from the todo

Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk

---

doc/README.rockchip | 1 - 1 file changed, 1 deletion(-)

Acked-by: Simon Glass sjg@chromium.org

Nice work!

diff --git a/doc/README.rockchip b/doc/README.rockchip index 347fc05..feb11ff 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -161,7 +161,6 @@ Future work

Immediate priorities are:

-- MMC support (in U-Boot itself)

• GPIO (driver exists but is lightly tested)
• I2C (driver exists but is non-functional)
• USB host

-- 2.5.0

Regards, Simon