9
0
Fork 0

arm: imx6: use imx6 specific cpu init function

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Lucas Stach 2014-06-25 09:18:20 +02:00 committed by Sascha Hauer
parent 0dd421f272
commit 3acaa78fd8
15 changed files with 34 additions and 24 deletions

View File

@ -1,5 +1,6 @@
#include <common.h>
#include <sizes.h>
#include <mach/generic.h>
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
@ -9,7 +10,7 @@ ENTRY_FUNCTION(start_imx6q_nitrogen6x_1g, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
fdt = __dtb_imx6q_nitrogen6x_start - get_runtime_offset();
@ -22,7 +23,7 @@ ENTRY_FUNCTION(start_imx6dl_nitrogen6x_1g, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
fdt = __dtb_imx6dl_nitrogen6x_start - get_runtime_offset();

View File

@ -21,6 +21,7 @@
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
#include <mach/imx6-mmdc.h>
#include <mach/generic.h>
static void sdram_init(void)
{
@ -142,7 +143,7 @@ ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2)
unsigned long sdram = 0x10000000;
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00940000 - 8);

View File

@ -21,6 +21,7 @@
#include <asm/barebox-arm.h>
#include <mach/imx6-mmdc.h>
#include <mach/imx6-regs.h>
#include <mach/generic.h>
#include <debug_ll.h>
@ -106,7 +107,7 @@ ENTRY_FUNCTION(start_imx6q_dfi_fs700_m60_6q_nanya, r0, r1, r2)
void *fdt;
int i;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00940000 - 8);
@ -125,7 +126,7 @@ ENTRY_FUNCTION(start_imx6q_dfi_fs700_m60_6q_micron, r0, r1, r2)
void *fdt;
int i;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00940000 - 8);
@ -148,7 +149,7 @@ ENTRY_FUNCTION(start_imx6dl_dfi_fs700_m60_6s, r0, r1, r2)
void *fdt;
int i;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);

View File

@ -30,7 +30,7 @@ ENTRY_FUNCTION(start_imx6s_riotboard, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
if (IS_ENABLED(CONFIG_DEBUG_LL)) {
writel(0x4, 0x020e016c);

View File

@ -2,9 +2,10 @@
#include <sizes.h>
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
#include <mach/generic.h>
void __naked barebox_arm_reset_vector(void)
{
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
barebox_arm_entry(0x10000000, SZ_2G, NULL);
}

View File

@ -1,5 +1,6 @@
#include <common.h>
#include <sizes.h>
#include <mach/generic.h>
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
@ -9,7 +10,7 @@ ENTRY_FUNCTION(start_imx6q_sabrelite, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
fdt = __dtb_imx6q_sabrelite_start - get_runtime_offset();
@ -22,7 +23,7 @@ ENTRY_FUNCTION(start_imx6dl_sabrelite, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
fdt = __dtb_imx6dl_sabrelite_start - get_runtime_offset();

View File

@ -1,5 +1,6 @@
#include <common.h>
#include <sizes.h>
#include <mach/generic.h>
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
@ -9,7 +10,7 @@ ENTRY_FUNCTION(start_imx6q_sabresd, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
fdt = __dtb_imx6q_sabresd_start - get_runtime_offset();

View File

@ -1,5 +1,6 @@
#include <common.h>
#include <sizes.h>
#include <mach/generic.h>
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
@ -9,7 +10,7 @@ ENTRY_FUNCTION(start_imx6_gk802, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
fdt = __dtb_imx6q_gk802_start - get_runtime_offset();
barebox_arm_entry(0x10000000, SZ_1G, fdt);

View File

@ -3,6 +3,7 @@
#include <io.h>
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
#include <mach/generic.h>
#include <mach/imx6-regs.h>
#include <debug_ll.h>
@ -33,7 +34,7 @@ ENTRY_FUNCTION(start_imx6q_guf_santaro, r0, r1, r2)
void *fdt;
int i;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);

View File

@ -59,7 +59,7 @@ static void __noreturn start_imx6q_phytec_pbaa03_common(uint32_t size)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);

View File

@ -61,7 +61,7 @@ ENTRY_FUNCTION(start_phytec_pbab01_1gib, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);
@ -77,7 +77,7 @@ ENTRY_FUNCTION(start_phytec_pbab01_2gib, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);
@ -95,7 +95,7 @@ ENTRY_FUNCTION(start_phytec_pbab01_4gib, r0, r1, r2)
__barebox_arm_head();
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);
@ -110,7 +110,7 @@ ENTRY_FUNCTION(start_phytec_pbab01dl_1gib, r0, r1, r2)
__barebox_arm_head();
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);
@ -125,7 +125,7 @@ ENTRY_FUNCTION(start_phytec_pbab01s_512mb, r0, r1, r2)
__barebox_arm_head();
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);

View File

@ -1,5 +1,6 @@
#include <common.h>
#include <sizes.h>
#include <mach/generic.h>
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
@ -9,7 +10,7 @@ ENTRY_FUNCTION(start_imx6dl_hummingboard, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
fdt = __dtb_imx6dl_hummingboard_start - get_runtime_offset();
barebox_arm_entry(0x10000000, SZ_512M, fdt);

View File

@ -45,7 +45,7 @@ ENTRY_FUNCTION(start_imx6q_mba6x, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);
@ -66,7 +66,7 @@ ENTRY_FUNCTION(start_imx6dl_mba6x, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);

View File

@ -1,5 +1,6 @@
#include <common.h>
#include <sizes.h>
#include <mach/generic.h>
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
@ -9,7 +10,7 @@ ENTRY_FUNCTION(start_imx6_udoo, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
fdt = __dtb_imx6q_udoo_start - get_runtime_offset();

View File

@ -61,7 +61,7 @@ ENTRY_FUNCTION(start_variscite_custom, r0, r1, r2)
{
void *fdt;
arm_cpu_lowlevel_init();
imx6_cpu_lowlevel_init();
arm_setup_stack(0x00920000 - 8);