summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Opaniuk <igor.opaniuk@toradex.com>2020-03-23 19:44:21 +0200
committerIgor Opaniuk <igor.opaniuk@toradex.com>2020-03-24 14:46:24 +0200
commit3dfa96656f746810462cf36eed76f02c1d577fb0 (patch)
tree3aa8c87f085608e74e5c0b83ad5f51922b59589d
parent890d03ae33a2fa62a1bd577ba54cbf3c945cccef (diff)
apalis-imx8: sync with MEK platform
1. Adding power-up of base board via SCFW 2. Moved BOOTAUX defines to defconfig Related-to: ELB-2605 Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
-rw-r--r--board/toradex/apalis-imx8/apalis-imx8.c2
-rw-r--r--configs/apalis-imx8_defconfig2
-rw-r--r--include/configs/apalis-imx8.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index 36dea9ab4a..eef9b2e6ed 100644
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -391,7 +391,7 @@ int board_late_init(void)
end_of_uboot += 9;
/* load hdmitxfw.bin and hdmirxfw.bin*/
- memcpy(IMX_HDMI_FIRMWARE_LOAD_ADDR, end_of_uboot,
+ memcpy(void *)IMX_HDMI_FIRMWARE_LOAD_ADDR, end_of_uboot,
IMX_HDMITX_FIRMWARE_SIZE + IMX_HDMIRX_FIRMWARE_SIZE);
sprintf(command, "hdp load 0x%x", IMX_HDMI_FIRMWARE_LOAD_ADDR);
diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig
index b994c693df..4b4c948ede 100644
--- a/configs/apalis-imx8_defconfig
+++ b/configs/apalis-imx8_defconfig
@@ -5,6 +5,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SMC_FUSE=y
CONFIG_TARGET_APALIS_IMX8=y
CONFIG_IMX_BOOTAUX=y
+CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
+CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 5877d7d212..2ff591a822 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -217,8 +217,6 @@
#endif
#define CONFIG_OF_SYSTEM_SETUP
-#define BOOTAUX_RESERVED_MEM_BASE 0x88000000
-#define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */
#if defined(CONFIG_ANDROID_SUPPORT)
#include "imx8qm_arm2_android.h"