diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-09-20 23:01:02 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-24 09:00:19 +0200 |
| commit | f3eafd84968160906a882cc54055c7052ac4456e (patch) | |
| tree | 03720fddf85de9508c7b71a4cea94981ea55b2d4 | |
| parent | 3da52f308a606aa06e9171419436af1086bc1cf4 (diff) | |
| download | barebox-f3eafd84968160906a882cc54055c7052ac4456e.tar.gz barebox-f3eafd84968160906a882cc54055c7052ac4456e.tar.xz | |
ARM: nxp-imx8mq-evk: Make use of memory size detection code
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/boards/nxp-imx8mq-evk/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/nxp-imx8mq-evk/lowlevel.c | 4 | ||||
| -rw-r--r-- | arch/arm/dts/imx8mq-evk.dts | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/boards/nxp-imx8mq-evk/board.c b/arch/arm/boards/nxp-imx8mq-evk/board.c index aae6970d8c..764eadb766 100644 --- a/arch/arm/boards/nxp-imx8mq-evk/board.c +++ b/arch/arm/boards/nxp-imx8mq-evk/board.c @@ -50,8 +50,6 @@ static int imx8mq_evk_mem_init(void) if (!of_machine_is_compatible("fsl,imx8mq-evk")) return 0; - arm_add_mem_device("ram0", 0x40000000, SZ_2G); - request_sdram_region("ATF", 0x40000000, SZ_128K); return 0; diff --git a/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c index 438c70c87e..1dff4b4d31 100644 --- a/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c +++ b/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c @@ -24,6 +24,7 @@ #include <asm/sections.h> #include <asm/mmu.h> #include <mach/atf.h> +#include <mach/esdctl.h> #include "ddr.h" @@ -121,7 +122,6 @@ ENTRY_FUNCTION(start_nxp_imx8mq_evk, r0, r1, r2) /* * Standard entry we hit once we initialized both DDR and ATF */ - barebox_arm_entry(MX8MQ_DDR_CSD1_BASE_ADDR, - SZ_2G + SZ_1G, __dtb_imx8mq_evk_start); + imx8mq_barebox_entry(__dtb_imx8mq_evk_start); } diff --git a/arch/arm/dts/imx8mq-evk.dts b/arch/arm/dts/imx8mq-evk.dts index d6d5d843ca..a6e724e2e2 100644 --- a/arch/arm/dts/imx8mq-evk.dts +++ b/arch/arm/dts/imx8mq-evk.dts @@ -7,6 +7,7 @@ /dts-v1/; #include "imx8mq.dtsi" +#include "imx8mq-ddrc.dtsi" / { model = "NXP i.MX8MQ EVK"; @@ -16,11 +17,6 @@ stdout-path = &uart1; }; - memory@40000000 { - device_type = "memory"; - reg = <0x00000000 0x40000000 0 0xc0000000>; - }; - reg_usdhc2_vmmc: regulator-vsd-3v3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_reg_usdhc2>; |