From 40b8a3db833294bb1bc116592fad52667bc39680 Mon Sep 17 00:00:00 2001 From: Prabhakar Kushwaha Date: Wed, 6 Jan 2016 10:30:18 +0530 Subject: board: ls2085aqds: Update kernel_size env variable kernel_size env variable is defined as 0x28000000, it is beyond NOR flash range. Update kernel_size with 40MB kernel size. Signed-off-by: Prabhakar Kushwaha Reviewed-by: York Sun --- include/configs/ls2080aqds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index ba84248081..a402c06a3b 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -346,7 +346,7 @@ unsigned long get_board_ddr_clk(void); "initrd_high=0xffffffffffffffff\0" \ "kernel_start=0x581100000\0" \ "kernel_load=0xa0000000\0" \ - "kernel_size=0x28000000\0" + "kernel_size=0x2800000\0" #ifdef CONFIG_FSL_MC_ENET #define CONFIG_FSL_MEMAC -- cgit v1.2.1 From cc7b8b9abb1de3b9957203afbeb9504a40fd2ca4 Mon Sep 17 00:00:00 2001 From: Alison Wang Date: Fri, 15 Jan 2016 15:29:32 +0800 Subject: armv7: ls102xa: Increase the supported kernel size Increase the kernel size supported for LS1021A platform. Define CONFIG_SYS_BOOTM_LEN to 64M. Signed-off-by: Alison Wang Reviewed-by: York Sun --- include/configs/ls1021aqds.h | 1 + include/configs/ls1021atwr.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index c90f5315fd..f6efc55059 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -665,5 +665,6 @@ unsigned long get_board_ddr_clk(void); #endif #include +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index f820de3b09..ae58646d5e 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -523,5 +523,6 @@ #endif #include +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ #endif -- cgit v1.2.1 From 5373b204dfbd33349486e4030c6135e180a25e54 Mon Sep 17 00:00:00 2001 From: Prabhakar Kushwaha Date: Wed, 20 Jan 2016 12:04:19 +0530 Subject: driver: net: fsl-mc: Memset dprc_cfg before configuring All fields of struct dprc_cfg are not being configured while creating child container. "Not" configured fields are assumed to be 0. So memset dprc_cfg before configuring the fields. Signed-off-by: Itai Katz Signed-off-by: Prabhakar Kushwaha Reviewed-by: York Sun --- drivers/net/fsl-mc/mc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index d38e98a2fb..bac7d239e3 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -818,6 +818,7 @@ static int dprc_init(void) goto err_root_open; } + memset(&cfg, 0, sizeof(struct dprc_cfg)); cfg.options = DPRC_CFG_OPT_TOPOLOGY_CHANGES_ALLOWED | DPRC_CFG_OPT_OBJ_CREATE_ALLOWED | DPRC_CFG_OPT_ALLOC_ALLOWED; -- cgit v1.2.1 From a2a4dc565d80a858b047287e7e672c39655e5c3f Mon Sep 17 00:00:00 2001 From: Prabhakar Kushwaha Date: Wed, 20 Jan 2016 12:04:37 +0530 Subject: driver: net: fsl-mc: Update print to reflect correct string Update printf with dpbp_exit to match with previous function call. Signed-off-by: Itai Katz Signed-off-by: Prabhakar Kushwaha Reviewed-by: York Sun --- drivers/net/fsl-mc/mc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index bac7d239e3..fdbd584186 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -1161,7 +1161,7 @@ int fsl_mc_ldpaa_exit(bd_t *bd) err = dpbp_exit(); if (err < 0) { - printf("dpni_exit() failed: %d\n", err); + printf("dpbp_exit() failed: %d\n", err); goto err; } -- cgit v1.2.1 From 73a5de4c6ea5f0269013897654c7ff50da97323b Mon Sep 17 00:00:00 2001 From: Qianyu Gong Date: Mon, 1 Feb 2016 13:09:16 +0800 Subject: armv8/ls1043aqds: fix DSPI/QSPI node in dts file Fix the lost dts info when merging patches. Fix DSPI node for 'commit e0579a5852b3 ("armv8/ls1043aqds: add DSPI support")' and QSPI node for 'commit 166ef1e90ce4 ("armv8/ls1043aqds: add QSPI support in SD boot")'. Signed-off-by: Gong Qianyu Reviewed-by: York Sun --- arch/arm/dts/fsl-ls1043a-qds.dtsi | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/arch/arm/dts/fsl-ls1043a-qds.dtsi b/arch/arm/dts/fsl-ls1043a-qds.dtsi index b9dad72d45..66efe673d9 100644 --- a/arch/arm/dts/fsl-ls1043a-qds.dtsi +++ b/arch/arm/dts/fsl-ls1043a-qds.dtsi @@ -14,6 +14,52 @@ / { model = "LS1043A QDS Board"; + aliases { + spi0 = &qspi; + spi1 = &dspi0; + }; +}; + +&dspi0 { + bus-num = <0>; + status = "okay"; + + dflash0: n25q128a { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash"; + reg = <0>; + spi-max-frequency = <1000000>; /* input clock */ + }; + + dflash1: sst25wf040b { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash"; + spi-max-frequency = <3500000>; + reg = <1>; + }; + + dflash2: en25s64 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash"; + spi-max-frequency = <3500000>; + reg = <2>; + }; +}; + +&qspi { + bus-num = <0>; + status = "okay"; + + qflash0: s25fl128s@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash"; + spi-max-frequency = <20000000>; + reg = <0>; + }; }; &i2c0 { -- cgit v1.2.1 From 2ea3a448ccfdd3d6f7e01060ba8fa49bd97a73e0 Mon Sep 17 00:00:00 2001 From: Ashish kumar Date: Wed, 27 Jan 2016 18:09:32 +0530 Subject: armv8: ls2080a: Implement workaround for core errata 829520, 833471 829520: Code bounded by indirect conditional branch might corrupt instruction stream. Workaround: Set CPUACTLR_EL1[4] = 1'b1 to disable the Indirect Predictor. 833471: VMSR FPSCR functional failure or deadlock. Workaround: Set CPUACTLR[38] to 1, which forces FPSCR write flush. Signed-off-by: Ashish Kumar Reviewed-by: York Sun --- arch/arm/cpu/armv8/start.S | 19 +++++++++++++++++++ arch/arm/include/asm/arch-fsl-layerscape/config.h | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 2ee60d60f1..67b166c7fd 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -168,6 +168,25 @@ apply_a57_core_errata: msr S3_1_c15_c2_0, x0 /* cpuactlr_el1 */ #endif +#ifdef CONFIG_ARM_ERRATA_833471 + mrs x0, S3_1_c15_c2_0 /* cpuactlr_el1 */ + /* FPSCR write flush. + * Note that in some cases where a flush is unnecessary this + could impact performance. */ + orr x0, x0, #1 << 38 + msr S3_1_c15_c2_0, x0 /* cpuactlr_el1 */ +#endif + +#ifdef CONFIG_ARM_ERRATA_829520 + mrs x0, S3_1_c15_c2_0 /* cpuactlr_el1 */ + /* Disable Indirect Predictor bit will prevent this erratum + from occurring + * Note that in some cases where a flush is unnecessary this + could impact performance. */ + orr x0, x0, #1 << 4 + msr S3_1_c15_c2_0, x0 /* cpuactlr_el1 */ +#endif + #ifdef CONFIG_ARM_ERRATA_833069 mrs x0, S3_1_c15_c2_0 /* cpuactlr_el1 */ /* Disable Enable Invalidates of BTB bit */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index f1b164fd6a..3d8dac13d1 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -121,6 +121,10 @@ #define CONFIG_SYS_FSL_ERRATUM_A009663 #define CONFIG_SYS_FSL_ERRATUM_A009942 +/* ARM A57 CORE ERRATA */ +#define CONFIG_ARM_ERRATA_829520 +#define CONFIG_ARM_ERRATA_833471 + #elif defined(CONFIG_LS1043A) #define CONFIG_MAX_CPUS 4 #define CONFIG_SYS_CACHELINE_SIZE 64 -- cgit v1.2.1 From 7711cc0a0648e215571b1d1768381963d92a1d97 Mon Sep 17 00:00:00 2001 From: Ashish kumar Date: Fri, 29 Jan 2016 16:40:08 +0530 Subject: arm8: ls2080: Move the core errata defines out of board specific file Valid for core A57 Signed-off-by: Ashish Kumar Reviewed-by: York Sun --- arch/arm/include/asm/arch-fsl-layerscape/config.h | 2 ++ include/configs/ls2080a_common.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index 3d8dac13d1..ff3b1bee3e 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -122,6 +122,8 @@ #define CONFIG_SYS_FSL_ERRATUM_A009942 /* ARM A57 CORE ERRATA */ +#define CONFIG_ARM_ERRATA_826974 +#define CONFIG_ARM_ERRATA_828024 #define CONFIG_ARM_ERRATA_829520 #define CONFIG_ARM_ERRATA_833471 diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 7323e10731..def0a6f3f0 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -15,9 +15,6 @@ #define CONFIG_GICV3 #define CONFIG_FSL_TZPC_BP147 -/* Errata fixes */ -#define CONFIG_ARM_ERRATA_828024 -#define CONFIG_ARM_ERRATA_826974 #include #include -- cgit v1.2.1