diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:15 +0200 |
| commit | 555e0db0fa05432c36f9d4a0b9cbcaf7498ac238 (patch) | |
| tree | d4a56f7fbc286f5462013e3722117b943c2179eb /arch/arm/boards | |
| parent | 3c397a02a4a357a72643fa97830e28a9140cb809 (diff) | |
| parent | cda0cf79bd23a028208e1dc6d4430aa02c4b4212 (diff) | |
| download | barebox-555e0db0fa05432c36f9d4a0b9cbcaf7498ac238.tar.gz barebox-555e0db0fa05432c36f9d4a0b9cbcaf7498ac238.tar.xz | |
Merge branch 'for-next/imx' into master
Diffstat (limited to 'arch/arm/boards')
| -rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063-512mb.h (renamed from arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063-512mb.imxcfg) | 1 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ul-512mb.imxcfg | 3 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ull-256mb.imxcfg (renamed from arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063-256mb.imxcfg) | 2 | ||||
| -rw-r--r-- | arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ull-512mb.imxcfg | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063-512mb.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063-512mb.h index 26998c3fd8..c4122d245d 100644 --- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063-512mb.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063-512mb.h @@ -7,4 +7,3 @@ wm 32 0x021B0000 0x84180000 #include "flash-header-phytec-pcl063.h" -#include <mach/habv4-imx6-gencsf.h> diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ul-512mb.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ul-512mb.imxcfg new file mode 100644 index 0000000000..f629a8e7b2 --- /dev/null +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ul-512mb.imxcfg @@ -0,0 +1,3 @@ + +#include "flash-header-phytec-pcl063-512mb.h" +#include <mach/habv4-imx6-gencsf.h> diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063-256mb.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ull-256mb.imxcfg index b93e81fb4e..e6871d8534 100644 --- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063-256mb.imxcfg +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ull-256mb.imxcfg @@ -7,4 +7,4 @@ wm 32 0x021B0000 0x83180000 #include "flash-header-phytec-pcl063.h" -#include <mach/habv4-imx6-gencsf.h> +#include <mach/habv4-imx6ull-gencsf.h> diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ull-512mb.imxcfg b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ull-512mb.imxcfg new file mode 100644 index 0000000000..d2d7183843 --- /dev/null +++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcl063ull-512mb.imxcfg @@ -0,0 +1,3 @@ + +#include "flash-header-phytec-pcl063-512mb.h" +#include <mach/habv4-imx6ull-gencsf.h> |