diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2014-05-01 23:32:49 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 15:09:09 +0200 |
commit | 4f381b1aaac3519a5772d6bec6fa4e6b06bb37ab (patch) | |
tree | 806f60a86676a8b03541038dc53bd64292e5f801 /arch/arm/boards | |
parent | 0668b9fe0a0d24dfc873829d8d882176e08e15ae (diff) | |
download | barebox-4f381b1aaac3519a5772d6bec6fa4e6b06bb37ab.tar.gz barebox-4f381b1aaac3519a5772d6bec6fa4e6b06bb37ab.tar.xz |
ARM: change signature of barebox_arm_entry
Mostly to make it clear that boarddata needs to be
something we can dereference.
As this is a pretty invasive change, use the opportunity
to make the signature 64bit safe.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards')
66 files changed, 137 insertions, 134 deletions
diff --git a/arch/arm/boards/archosg9/lowlevel.c b/arch/arm/boards/archosg9/lowlevel.c index 6c939928d6..6813e0d18a 100644 --- a/arch/arm/boards/archosg9/lowlevel.c +++ b/arch/arm/boards/archosg9/lowlevel.c @@ -79,5 +79,5 @@ void __naked __bare_init barebox_arm_reset_vector(uint32_t *data) archosg9_init_lowlevel(); out: - barebox_arm_entry(0x80000000, SZ_1G, 0); + barebox_arm_entry(0x80000000, SZ_1G, NULL); } diff --git a/arch/arm/boards/avnet-zedboard/lowlevel.c b/arch/arm/boards/avnet-zedboard/lowlevel.c index fb05ef895d..7770bcb7cf 100644 --- a/arch/arm/boards/avnet-zedboard/lowlevel.c +++ b/arch/arm/boards/avnet-zedboard/lowlevel.c @@ -257,5 +257,5 @@ void __naked barebox_arm_reset_vector(void) writel(0x0000767B, ZYNQ_SLCR_LOCK); arm_cpu_lowlevel_init(); - barebox_arm_entry(0, SZ_512M, 0); + barebox_arm_entry(0, SZ_512M, NULL); } diff --git a/arch/arm/boards/beagle/lowlevel.c b/arch/arm/boards/beagle/lowlevel.c index cdb88caa12..62c98a9cec 100644 --- a/arch/arm/boards/beagle/lowlevel.c +++ b/arch/arm/boards/beagle/lowlevel.c @@ -189,5 +189,5 @@ void __naked __bare_init barebox_arm_reset_vector(uint32_t *data) beagle_board_init(); - barebox_arm_entry(0x80000000, SZ_128M, 0); + barebox_arm_entry(0x80000000, SZ_128M, NULL); } diff --git a/arch/arm/boards/beaglebone/lowlevel.c b/arch/arm/boards/beaglebone/lowlevel.c index 92389a9557..0869cb9f15 100644 --- a/arch/arm/boards/beaglebone/lowlevel.c +++ b/arch/arm/boards/beaglebone/lowlevel.c @@ -119,18 +119,19 @@ extern char __dtb_am335x_bone_end[]; */ static noinline int beaglebone_sram_init(void) { - uint32_t fdt, fdt_end, sdram_start, sdram_size; + uint32_t sdram_start, sdram_size; + void *fdt, *fdt_end; sdram_start = 0x80000000; if (is_beaglebone_black()) { sdram_size = SZ_512M; - fdt = (uint32_t)__dtb_am335x_boneblack_start; - fdt_end = (uint32_t)__dtb_am335x_boneblack_end; + fdt = __dtb_am335x_boneblack_start; + fdt_end = __dtb_am335x_boneblack_end; } else { sdram_size = SZ_256M; - fdt = (uint32_t)__dtb_am335x_bone_start; - fdt_end = (uint32_t)__dtb_am335x_bone_end; + fdt = __dtb_am335x_bone_start; + fdt_end = __dtb_am335x_bone_end; } /* WDT1 is already running when the bootloader gets control @@ -161,7 +162,7 @@ static noinline int beaglebone_sram_init(void) * Copy the devicetree blob to sdram so that the barebox code finds it * inside valid SDRAM instead of SRAM. */ - memcpy((void *)sdram_start, (void *)fdt, fdt_end - fdt); + memcpy((void *)sdram_start, fdt, fdt_end - fdt); fdt = sdram_start; barebox_arm_entry(sdram_start, sdram_size, fdt); @@ -183,14 +184,15 @@ ENTRY_FUNCTION(start_am33xx_beaglebone_sram, bootinfo, r1, r2) ENTRY_FUNCTION(start_am33xx_beaglebone_sdram, r0, r1, r2) { - uint32_t fdt, sdram_size; + uint32_t sdram_size; + void *fdt; if (is_beaglebone_black()) { sdram_size = SZ_512M; - fdt = (uint32_t)__dtb_am335x_boneblack_start; + fdt = __dtb_am335x_boneblack_start; } else { sdram_size = SZ_256M; - fdt = (uint32_t)__dtb_am335x_bone_start; + fdt = __dtb_am335x_bone_start; } fdt -= get_runtime_offset(); diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c b/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c index 5b11084670..60a84ef63a 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c +++ b/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c @@ -7,11 +7,11 @@ extern char __dtb_imx6q_nitrogen6x_start[]; ENTRY_FUNCTION(start_imx6q_nitrogen6x_1g, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx6q_nitrogen6x_start - get_runtime_offset(); + fdt = __dtb_imx6q_nitrogen6x_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } @@ -20,11 +20,11 @@ extern char __dtb_imx6dl_nitrogen6x_start[]; ENTRY_FUNCTION(start_imx6dl_nitrogen6x_1g, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx6dl_nitrogen6x_start - get_runtime_offset(); + fdt = __dtb_imx6dl_nitrogen6x_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } diff --git a/arch/arm/boards/ccxmx51/lowlevel.c b/arch/arm/boards/ccxmx51/lowlevel.c index 9519b77335..3e67b314a7 100644 --- a/arch/arm/boards/ccxmx51/lowlevel.c +++ b/arch/arm/boards/ccxmx51/lowlevel.c @@ -7,5 +7,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(MX51_CSD0_BASE_ADDR, SZ_128M, 0); + barebox_arm_entry(MX51_CSD0_BASE_ADDR, SZ_128M, NULL); } diff --git a/arch/arm/boards/chumby_falconwing/lowlevel.c b/arch/arm/boards/chumby_falconwing/lowlevel.c index c23a12db12..d26562c02b 100644 --- a/arch/arm/boards/chumby_falconwing/lowlevel.c +++ b/arch/arm/boards/chumby_falconwing/lowlevel.c @@ -7,5 +7,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, 0); + barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, NULL); } diff --git a/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c b/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c index f7b90331bb..aa3b09b2ee 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c +++ b/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c @@ -7,5 +7,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, 0); + barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, NULL); } diff --git a/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c b/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c index 81b6ac4cbe..071918cb53 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c +++ b/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c @@ -140,13 +140,14 @@ extern char __dtb_imx6q_dmo_edmqmx6_end[]; ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2) { - unsigned long fdt, sdram = 0x10000000; + unsigned long sdram = 0x10000000; + void *fdt; arm_cpu_lowlevel_init(); arm_setup_stack(0x00940000 - 8); - fdt = (unsigned long)__dtb_imx6q_dmo_edmqmx6_start - get_runtime_offset(); + fdt = __dtb_imx6q_dmo_edmqmx6_start - get_runtime_offset(); if (get_pc() < 0x10000000) { sdram_init(); @@ -158,10 +159,9 @@ ENTRY_FUNCTION(start_imx6_realq7, r0, r1, r2) * Copy the devicetree blob to sdram so that the barebox code finds it * inside valid SDRAM instead of SRAM. */ - memcpy((void *)sdram, (void *)fdt, - __dtb_imx6q_dmo_edmqmx6_end - - __dtb_imx6q_dmo_edmqmx6_start); - fdt = sdram; + memcpy((void*)sdram, fdt, __dtb_imx6q_dmo_edmqmx6_end - + __dtb_imx6q_dmo_edmqmx6_start); + fdt = (void *)sdram; } barebox_arm_entry(sdram, SZ_2G, fdt); diff --git a/arch/arm/boards/dfi-fs700-m60/lowlevel.c b/arch/arm/boards/dfi-fs700-m60/lowlevel.c index 5d1e5f409e..541e6c1874 100644 --- a/arch/arm/boards/dfi-fs700-m60/lowlevel.c +++ b/arch/arm/boards/dfi-fs700-m60/lowlevel.c @@ -103,7 +103,7 @@ extern char __dtb_imx6q_dfi_fs700_m60_6q_start[]; ENTRY_FUNCTION(start_imx6q_dfi_fs700_m60_6q_nanya, r0, r1, r2) { - uint32_t fdt; + void *fdt; int i; arm_cpu_lowlevel_init(); @@ -115,14 +115,14 @@ ENTRY_FUNCTION(start_imx6q_dfi_fs700_m60_6q_nanya, r0, r1, r2) early_uart_init_6q(); - fdt = (uint32_t)__dtb_imx6q_dfi_fs700_m60_6q_start - get_runtime_offset(); + fdt = __dtb_imx6q_dfi_fs700_m60_6q_start - get_runtime_offset(); barebox_arm_entry(0x10000000, memsize_1G_2G(), fdt); } ENTRY_FUNCTION(start_imx6q_dfi_fs700_m60_6q_micron, r0, r1, r2) { - uint32_t fdt; + void *fdt; int i; arm_cpu_lowlevel_init(); @@ -134,7 +134,7 @@ ENTRY_FUNCTION(start_imx6q_dfi_fs700_m60_6q_micron, r0, r1, r2) early_uart_init_6q(); - fdt = (uint32_t)__dtb_imx6q_dfi_fs700_m60_6q_start - get_runtime_offset(); + fdt = __dtb_imx6q_dfi_fs700_m60_6q_start - get_runtime_offset(); *(uint32_t *)0x10000000 = SZ_1G; @@ -145,7 +145,7 @@ extern char __dtb_imx6dl_dfi_fs700_m60_6s_start[]; ENTRY_FUNCTION(start_imx6dl_dfi_fs700_m60_6s, r0, r1, r2) { - uint32_t fdt; + void *fdt; int i; arm_cpu_lowlevel_init(); @@ -157,7 +157,7 @@ ENTRY_FUNCTION(start_imx6dl_dfi_fs700_m60_6s, r0, r1, r2) early_uart_init_6s(); - fdt = (uint32_t)__dtb_imx6dl_dfi_fs700_m60_6s_start - get_runtime_offset(); + fdt = __dtb_imx6dl_dfi_fs700_m60_6s_start - get_runtime_offset(); barebox_arm_entry(0x10000000, memsize_512M_1G(), fdt); } diff --git a/arch/arm/boards/ebv-socrates/lowlevel.c b/arch/arm/boards/ebv-socrates/lowlevel.c index 035df70839..9c11543209 100644 --- a/arch/arm/boards/ebv-socrates/lowlevel.c +++ b/arch/arm/boards/ebv-socrates/lowlevel.c @@ -47,11 +47,11 @@ extern char __dtb_socfpga_cyclone5_socrates_start[]; ENTRY_FUNCTION(start_socfpga_socrates, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_socfpga_cyclone5_socrates_start - get_runtime_offset(); + fdt = __dtb_socfpga_cyclone5_socrates_start - get_runtime_offset(); barebox_arm_entry(0x0, SZ_1G, fdt); } @@ -82,7 +82,7 @@ static noinline void socrates_entry(void) puts_ll("done\n"); - barebox_arm_entry(0x0, SZ_1G, 0); + barebox_arm_entry(0x0, SZ_1G, NULL); } ENTRY_FUNCTION(start_socfpga_socrates_xload, r0, r1, r2) diff --git a/arch/arm/boards/efika-mx-smartbook/lowlevel.c b/arch/arm/boards/efika-mx-smartbook/lowlevel.c index 72c8b00a31..0d32eee860 100644 --- a/arch/arm/boards/efika-mx-smartbook/lowlevel.c +++ b/arch/arm/boards/efika-mx-smartbook/lowlevel.c @@ -8,13 +8,13 @@ extern char __dtb_imx51_genesi_efika_sb_start[]; ENTRY_FUNCTION(start_imx51_genesi_efikasb, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); arm_setup_stack(0x20000000 - 16); imx51_init_lowlevel(800); - fdt = (uint32_t)__dtb_imx51_genesi_efika_sb_start - get_runtime_offset(); + fdt = __dtb_imx51_genesi_efika_sb_start - get_runtime_offset(); imx51_barebox_entry(fdt); } diff --git a/arch/arm/boards/embest-riotboard/lowlevel.c b/arch/arm/boards/embest-riotboard/lowlevel.c index 814658aaf5..64edd61cc6 100644 --- a/arch/arm/boards/embest-riotboard/lowlevel.c +++ b/arch/arm/boards/embest-riotboard/lowlevel.c @@ -28,7 +28,7 @@ extern char __dtb_imx6s_riotboard_start[]; ENTRY_FUNCTION(start_imx6s_riotboard, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); @@ -38,6 +38,6 @@ ENTRY_FUNCTION(start_imx6s_riotboard, r0, r1, r2) putc_ll('a'); } - fdt = (uint32_t)__dtb_imx6s_riotboard_start - get_runtime_offset(); + fdt = __dtb_imx6s_riotboard_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } diff --git a/arch/arm/boards/eukrea_cpuimx25/lowlevel.c b/arch/arm/boards/eukrea_cpuimx25/lowlevel.c index f0bf2c7fd5..4edbbe4b8a 100644 --- a/arch/arm/boards/eukrea_cpuimx25/lowlevel.c +++ b/arch/arm/boards/eukrea_cpuimx25/lowlevel.c @@ -134,5 +134,5 @@ void __bare_init __naked barebox_arm_reset_vector(void) imx25_barebox_boot_nand_external(0); } out: - imx25_barebox_entry(0); + imx25_barebox_entry(NULL); } diff --git a/arch/arm/boards/eukrea_cpuimx35/lowlevel.c b/arch/arm/boards/eukrea_cpuimx35/lowlevel.c index b8ba3c8716..4788ae2e42 100644 --- a/arch/arm/boards/eukrea_cpuimx35/lowlevel.c +++ b/arch/arm/boards/eukrea_cpuimx35/lowlevel.c @@ -144,5 +144,5 @@ void __bare_init __naked barebox_arm_reset_vector(void) } out: - imx35_barebox_entry(0); + imx35_barebox_entry(NULL); } diff --git a/arch/arm/boards/eukrea_cpuimx51/lowlevel.c b/arch/arm/boards/eukrea_cpuimx51/lowlevel.c index 3e6a0ee328..c3f7b4acbb 100644 --- a/arch/arm/boards/eukrea_cpuimx51/lowlevel.c +++ b/arch/arm/boards/eukrea_cpuimx51/lowlevel.c @@ -5,5 +5,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - imx51_barebox_entry(0); + imx51_barebox_entry(NULL); } diff --git a/arch/arm/boards/freescale-mx23-evk/lowlevel.c b/arch/arm/boards/freescale-mx23-evk/lowlevel.c index 155944468f..2a26a7763e 100644 --- a/arch/arm/boards/freescale-mx23-evk/lowlevel.c +++ b/arch/arm/boards/freescale-mx23-evk/lowlevel.c @@ -7,5 +7,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(IMX_MEMORY_BASE, SZ_32M, 0); + barebox_arm_entry(IMX_MEMORY_BASE, SZ_32M, NULL); } diff --git a/arch/arm/boards/freescale-mx28-evk/lowlevel.c b/arch/arm/boards/freescale-mx28-evk/lowlevel.c index f7b90331bb..aa3b09b2ee 100644 --- a/arch/arm/boards/freescale-mx28-evk/lowlevel.c +++ b/arch/arm/boards/freescale-mx28-evk/lowlevel.c @@ -7,5 +7,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, 0); + barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, NULL); } diff --git a/arch/arm/boards/freescale-mx51-babbage/lowlevel.c b/arch/arm/boards/freescale-mx51-babbage/lowlevel.c index f60601194d..5a5a83c436 100644 --- a/arch/arm/boards/freescale-mx51-babbage/lowlevel.c +++ b/arch/arm/boards/freescale-mx51-babbage/lowlevel.c @@ -7,11 +7,11 @@ extern char __dtb_imx51_babbage_start[]; ENTRY_FUNCTION(start_imx51_babbage, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx51_babbage_start - get_runtime_offset(); + fdt = __dtb_imx51_babbage_start - get_runtime_offset(); imx51_barebox_entry(fdt); } diff --git a/arch/arm/boards/freescale-mx53-qsb/lowlevel.c b/arch/arm/boards/freescale-mx53-qsb/lowlevel.c index c9e057ae67..51b9ef8db7 100644 --- a/arch/arm/boards/freescale-mx53-qsb/lowlevel.c +++ b/arch/arm/boards/freescale-mx53-qsb/lowlevel.c @@ -7,11 +7,11 @@ extern char __dtb_imx53_qsb_start[]; ENTRY_FUNCTION(start_imx53_loco, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx53_qsb_start - get_runtime_offset(); + fdt = __dtb_imx53_qsb_start - get_runtime_offset(); imx53_barebox_entry(fdt); } @@ -20,11 +20,11 @@ extern char __dtb_imx53_qsrb_start[]; ENTRY_FUNCTION(start_imx53_loco_r, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx53_qsrb_start - get_runtime_offset(); + fdt = __dtb_imx53_qsrb_start - get_runtime_offset(); imx53_barebox_entry(fdt); } diff --git a/arch/arm/boards/freescale-mx53-smd/lowlevel.c b/arch/arm/boards/freescale-mx53-smd/lowlevel.c index 60c28f7856..1db07e2e2c 100644 --- a/arch/arm/boards/freescale-mx53-smd/lowlevel.c +++ b/arch/arm/boards/freescale-mx53-smd/lowlevel.c @@ -5,5 +5,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - imx53_barebox_entry(0); + imx53_barebox_entry(NULL); } diff --git a/arch/arm/boards/freescale-mx53-vmx53/lowlevel.c b/arch/arm/boards/freescale-mx53-vmx53/lowlevel.c index ba356cdde3..4054fd51e2 100644 --- a/arch/arm/boards/freescale-mx53-vmx53/lowlevel.c +++ b/arch/arm/boards/freescale-mx53-vmx53/lowlevel.c @@ -7,11 +7,11 @@ extern char __dtb_imx53_voipac_bsb_start[]; ENTRY_FUNCTION(start_imx53_vmx53, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx53_voipac_bsb_start - get_runtime_offset(); + fdt = __dtb_imx53_voipac_bsb_start - get_runtime_offset(); imx53_barebox_entry(fdt); } diff --git a/arch/arm/boards/freescale-mx6-arm2/lowlevel.c b/arch/arm/boards/freescale-mx6-arm2/lowlevel.c index 15d9287adb..53783bb0ab 100644 --- a/arch/arm/boards/freescale-mx6-arm2/lowlevel.c +++ b/arch/arm/boards/freescale-mx6-arm2/lowlevel.c @@ -6,5 +6,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(0x10000000, SZ_2G, 0); + barebox_arm_entry(0x10000000, SZ_2G, NULL); } diff --git a/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c b/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c index 14a7f322f7..a154381bfa 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c @@ -7,11 +7,11 @@ extern char __dtb_imx6q_sabrelite_start[]; ENTRY_FUNCTION(start_imx6q_sabrelite, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx6q_sabrelite_start - get_runtime_offset(); + fdt = __dtb_imx6q_sabrelite_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } @@ -20,11 +20,11 @@ extern char __dtb_imx6dl_sabrelite_start[]; ENTRY_FUNCTION(start_imx6dl_sabrelite, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx6dl_sabrelite_start - get_runtime_offset(); + fdt = __dtb_imx6dl_sabrelite_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } diff --git a/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c b/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c index c8b542aa25..325de84983 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c +++ b/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c @@ -7,11 +7,11 @@ extern char __dtb_imx6q_sabresd_start[]; ENTRY_FUNCTION(start_imx6q_sabresd, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx6q_sabresd_start - get_runtime_offset(); + fdt = __dtb_imx6q_sabresd_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } diff --git a/arch/arm/boards/friendlyarm-mini6410/lowlevel.c b/arch/arm/boards/friendlyarm-mini6410/lowlevel.c index 3a8af81229..a21a3f8301 100644 --- a/arch/arm/boards/friendlyarm-mini6410/lowlevel.c +++ b/arch/arm/boards/friendlyarm-mini6410/lowlevel.c @@ -7,5 +7,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(S3C_SDRAM_BASE, SZ_128M, 0); + barebox_arm_entry(S3C_SDRAM_BASE, SZ_128M, NULL); } diff --git a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c index d980957739..236fe7f195 100644 --- a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c +++ b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c @@ -113,5 +113,5 @@ void __bare_init barebox_arm_reset_vector(void) debug_led(1, 0); boot: - barebox_arm_entry(S3C_SDRAM_BASE, SZ_256M, 0); + barebox_arm_entry(S3C_SDRAM_BASE, SZ_256M, NULL); } diff --git a/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c b/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c index 3a8af81229..a21a3f8301 100644 --- a/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c +++ b/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c @@ -7,5 +7,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(S3C_SDRAM_BASE, SZ_128M, 0); + barebox_arm_entry(S3C_SDRAM_BASE, SZ_128M, NULL); } diff --git a/arch/arm/boards/gk802/lowlevel.c b/arch/arm/boards/gk802/lowlevel.c index e159ddbb23..bfedfb6c99 100644 --- a/arch/arm/boards/gk802/lowlevel.c +++ b/arch/arm/boards/gk802/lowlevel.c @@ -7,10 +7,10 @@ extern char __dtb_imx6q_gk802_start[]; ENTRY_FUNCTION(start_imx6_gk802, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx6q_gk802_start - get_runtime_offset(); + fdt = __dtb_imx6q_gk802_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } diff --git a/arch/arm/boards/guf-cupid/lowlevel.c b/arch/arm/boards/guf-cupid/lowlevel.c index 4c0de9caed..6fc90fbbdc 100644 --- a/arch/arm/boards/guf-cupid/lowlevel.c +++ b/arch/arm/boards/guf-cupid/lowlevel.c @@ -320,5 +320,5 @@ void __bare_init __naked barebox_arm_reset_vector(void) } out: - imx35_barebox_entry(0); + imx35_barebox_entry(NULL); } diff --git a/arch/arm/boards/guf-neso/lowlevel.c b/arch/arm/boards/guf-neso/lowlevel.c index d26ee73ef1..2828359598 100644 --- a/arch/arm/boards/guf-neso/lowlevel.c +++ b/arch/arm/boards/guf-neso/lowlevel.c @@ -94,5 +94,5 @@ void __bare_init __naked barebox_arm_reset_vector(void) } out: - imx27_barebox_entry(0); + imx27_barebox_entry(NULL); } diff --git a/arch/arm/boards/guf-santaro/lowlevel.c b/arch/arm/boards/guf-santaro/lowlevel.c index da6d92af3b..daf9709dfb 100644 --- a/arch/arm/boards/guf-santaro/lowlevel.c +++ b/arch/arm/boards/guf-santaro/lowlevel.c @@ -30,7 +30,7 @@ extern char __dtb_imx6q_guf_santaro_start[]; ENTRY_FUNCTION(start_imx6q_guf_santaro, r0, r1, r2) { - uint32_t fdt; + void *fdt; int i; arm_cpu_lowlevel_init(); @@ -42,7 +42,7 @@ ENTRY_FUNCTION(start_imx6q_guf_santaro, r0, r1, r2) setup_uart(); - fdt = (uint32_t)__dtb_imx6q_guf_santaro_start - get_runtime_offset(); + fdt = __dtb_imx6q_guf_santaro_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } diff --git a/arch/arm/boards/guf-vincell/lowlevel.c b/arch/arm/boards/guf-vincell/lowlevel.c index 534e506e7b..186c0d9dd0 100644 --- a/arch/arm/boards/guf-vincell/lowlevel.c +++ b/arch/arm/boards/guf-vincell/lowlevel.c @@ -132,7 +132,7 @@ void __bare_init __naked barebox_arm_reset_vector(void) /* Skip SDRAM initialization if we run from RAM */ r = get_pc(); if (r > 0x70000000 && r < 0xf0000000) - imx53_barebox_entry(0); + imx53_barebox_entry(NULL); /* Setup a preliminary stack */ r = 0xf8000000 + 0x60000 - 16; @@ -146,5 +146,5 @@ void __bare_init __naked barebox_arm_reset_vector(void) imx_esdctlv4_init(); - imx53_barebox_entry(0); + imx53_barebox_entry(NULL); } diff --git a/arch/arm/boards/highbank/lowlevel.c b/arch/arm/boards/highbank/lowlevel.c index b862a1f857..c0405ed3a4 100644 --- a/arch/arm/boards/highbank/lowlevel.c +++ b/arch/arm/boards/highbank/lowlevel.c @@ -13,5 +13,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(0x00000000, SZ_512M, 0); + barebox_arm_entry(0x00000000, SZ_512M, NULL); } diff --git a/arch/arm/boards/imx233-olinuxino/lowlevel.c b/arch/arm/boards/imx233-olinuxino/lowlevel.c index c23a12db12..d26562c02b 100644 --- a/arch/arm/boards/imx233-olinuxino/lowlevel.c +++ b/arch/arm/boards/imx233-olinuxino/lowlevel.c @@ -7,5 +7,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, 0); + barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, NULL); } diff --git a/arch/arm/boards/karo-tx25/lowlevel.c b/arch/arm/boards/karo-tx25/lowlevel.c index be27bc7bd3..861c27b8a6 100644 --- a/arch/arm/boards/karo-tx25/lowlevel.c +++ b/arch/arm/boards/karo-tx25/lowlevel.c @@ -75,7 +75,7 @@ static inline void __bare_init setup_sdram(uint32_t base, uint32_t esdctl, writel(esdctl, esdctlreg); } -static void __bare_init karo_tx25_common_init(uint32_t fdt) +static void __bare_init karo_tx25_common_init(void *fdt) { uint32_t r; @@ -167,11 +167,11 @@ extern char __dtb_imx25_karo_tx25_start[]; ENTRY_FUNCTION(start_imx25_karo_tx25, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_setup_stack(MX25_IRAM_BASE_ADDR + MX25_IRAM_SIZE - 8); - fdt = (uint32_t)__dtb_imx25_karo_tx25_start - get_runtime_offset(); + fdt = __dtb_imx25_karo_tx25_start - get_runtime_offset(); karo_tx25_common_init(fdt); } diff --git a/arch/arm/boards/karo-tx28/lowlevel.c b/arch/arm/boards/karo-tx28/lowlevel.c index f7b90331bb..aa3b09b2ee 100644 --- a/arch/arm/boards/karo-tx28/lowlevel.c +++ b/arch/arm/boards/karo-tx28/lowlevel.c @@ -7,5 +7,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, 0); + barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, NULL); } diff --git a/arch/arm/boards/karo-tx51/lowlevel.c b/arch/arm/boards/karo-tx51/lowlevel.c index 3e6a0ee328..c3f7b4acbb 100644 --- a/arch/arm/boards/karo-tx51/lowlevel.c +++ b/arch/arm/boards/karo-tx51/lowlevel.c @@ -5,5 +5,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - imx51_barebox_entry(0); + imx51_barebox_entry(NULL); } diff --git a/arch/arm/boards/karo-tx53/lowlevel.c b/arch/arm/boards/karo-tx53/lowlevel.c index f47f260722..d82e6669b0 100644 --- a/arch/arm/boards/karo-tx53/lowlevel.c +++ b/arch/arm/boards/karo-tx53/lowlevel.c @@ -16,5 +16,5 @@ void __naked barebox_arm_reset_vector(void) if (IS_ENABLED(CONFIG_TX53_REV_XX30)) imx53_init_lowlevel_early(800); - imx53_barebox_entry(0); + imx53_barebox_entry(NULL); } diff --git a/arch/arm/boards/mioa701/lowlevel.c b/arch/arm/boards/mioa701/lowlevel.c index 02dc58696c..aa4a82e598 100644 --- a/arch/arm/boards/mioa701/lowlevel.c +++ b/arch/arm/boards/mioa701/lowlevel.c @@ -6,5 +6,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(0xa0000000, SZ_64M, 0); + barebox_arm_entry(0xa0000000, SZ_64M, NULL); } diff --git a/arch/arm/boards/mx31moboard/lowlevel.c b/arch/arm/boards/mx31moboard/lowlevel.c index e9ffb74e23..b00c4bb2c0 100644 --- a/arch/arm/boards/mx31moboard/lowlevel.c +++ b/arch/arm/boards/mx31moboard/lowlevel.c @@ -83,7 +83,7 @@ static noinline __noreturn void mx31moboard_startup(void) /* Skip SDRAM initialization if we run from RAM */ r = get_pc(); if (r > 0x80000000 && r < 0xa0000000) - imx31_barebox_entry(0); + imx31_barebox_entry(NULL); writel(0x00000004, MX31_ESDCTL_BASE_ADDR + IMX_ESDMISC); writel(0x00695727, MX31_ESDCTL_BASE_ADDR + IMX_ESDCFG0); @@ -99,7 +99,7 @@ static noinline __noreturn void mx31moboard_startup(void) writel(0xDEADBEEF, MX31_CSD0_BASE_ADDR); writel(0x0000000c, MX31_ESDCTL_BASE_ADDR + IMX_ESDMISC); - imx31_barebox_entry(0); + imx31_barebox_entry(NULL); } diff --git a/arch/arm/boards/nhk8815/lowlevel.c b/arch/arm/boards/nhk8815/lowlevel.c index b694c8946d..ce06f45c91 100644 --- a/arch/arm/boards/nhk8815/lowlevel.c +++ b/arch/arm/boards/nhk8815/lowlevel.c @@ -6,5 +6,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(0x0, SZ_64M, 0); + barebox_arm_entry(0x0, SZ_64M, NULL); } diff --git a/arch/arm/boards/omap343xdsp/lowlevel.c b/arch/arm/boards/omap343xdsp/lowlevel.c index 816f400c83..18ddff3625 100644 --- a/arch/arm/boards/omap343xdsp/lowlevel.c +++ b/arch/arm/boards/omap343xdsp/lowlevel.c @@ -556,5 +556,5 @@ void __naked __bare_init barebox_arm_reset_vector(uint32_t *data) sdp343x_board_init(); - barebox_arm_entry(0x80000000, SZ_128M, 0); + barebox_arm_entry(0x80000000, SZ_128M, NULL); } diff --git a/arch/arm/boards/omap3evm/lowlevel.c b/arch/arm/boards/omap3evm/lowlevel.c index 56075c1e6f..5c3e8902a0 100644 --- a/arch/arm/boards/omap3evm/lowlevel.c +++ b/arch/arm/boards/omap3evm/lowlevel.c @@ -169,5 +169,5 @@ void __naked __bare_init barebox_arm_reset_vector(uint32_t *data) omap3_evm_board_init(); - barebox_arm_entry(0x80000000, SZ_128M, 0); + barebox_arm_entry(0x80000000, SZ_128M, NULL); } diff --git a/arch/arm/boards/panda/lowlevel.c b/arch/arm/boards/panda/lowlevel.c index 205aaaf817..2679ae4690 100644 --- a/arch/arm/boards/panda/lowlevel.c +++ b/arch/arm/boards/panda/lowlevel.c @@ -92,5 +92,5 @@ void __bare_init __naked barebox_arm_reset_vector(uint32_t *data) panda_init_lowlevel(); out: - barebox_arm_entry(0x80000000, SZ_1G, 0); + barebox_arm_entry(0x80000000, SZ_1G, NULL); } diff --git a/arch/arm/boards/phytec-phycard-imx27/lowlevel.c b/arch/arm/boards/phytec-phycard-imx27/lowlevel.c index 5b3bdafa71..75b97881f5 100644 --- a/arch/arm/boards/phytec-phycard-imx27/lowlevel.c +++ b/arch/arm/boards/phytec-phycard-imx27/lowlevel.c @@ -74,7 +74,7 @@ void __bare_init __naked barebox_arm_reset_vector(void) /* Skip SDRAM initialization if we run from RAM */ r = get_pc(); if (r > 0xa0000000 && r < 0xc0000000) - imx27_barebox_entry(0); + imx27_barebox_entry(NULL); /* 399 MHz */ writel(IMX_PLL_PD(0) | diff --git a/arch/arm/boards/phytec-phycard-omap3/lowlevel.c b/arch/arm/boards/phytec-phycard-omap3/lowlevel.c index 7a67493fd6..57f6389664 100644 --- a/arch/arm/boards/phytec-phycard-omap3/lowlevel.c +++ b/arch/arm/boards/phytec-phycard-omap3/lowlevel.c @@ -260,5 +260,5 @@ void __bare_init __naked barebox_arm_reset_vector(uint32_t *data) pcaal1_board_init(); - barebox_arm_entry(0x80000000, SZ_256M, 0); + barebox_arm_entry(0x80000000, SZ_256M, NULL); } diff --git a/arch/arm/boards/phytec-phycard-omap4/lowlevel.c b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c index 1ddf8a07ed..841ac4b206 100644 --- a/arch/arm/boards/phytec-phycard-omap4/lowlevel.c +++ b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c @@ -102,5 +102,5 @@ void __bare_init __naked barebox_arm_reset_vector(uint32_t *data) pcaaxl2_init_lowlevel(); out: - barebox_arm_entry(0x80000000, SZ_512M, 0); + barebox_arm_entry(0x80000000, SZ_512M, NULL); } diff --git a/arch/arm/boards/phytec-phycore-am335x/lowlevel.c b/arch/arm/boards/phytec-phycore-am335x/lowlevel.c index d3cac6860b..a413b67753 100644 --- a/arch/arm/boards/phytec-phycore-am335x/lowlevel.c +++ b/arch/arm/boards/phytec-phycore-am335x/lowlevel.c @@ -60,7 +60,8 @@ extern char __dtb_am335x_phytec_phycore_end[]; */ static noinline void pcm051_board_init(void) { - unsigned long sdram = 0x80000000, fdt; + uint32_t sdram = 0x80000000; + void *fdt; /* WDT1 is already running when the bootloader gets control * Disable it to avoid "random" resets @@ -89,7 +90,7 @@ static noinline void pcm051_board_init(void) memcpy((void *)sdram, __dtb_am335x_phytec_phycore_start, __dtb_am335x_phytec_phycore_end - __dtb_am335x_phytec_phycore_start); - fdt = sdram; + fdt = (void *)sdram; barebox_arm_entry(sdram, SZ_512M, fdt); } @@ -112,9 +113,9 @@ ENTRY_FUNCTION(start_am33xx_phytec_phycore_sram, bootinfo, r1, r2) ENTRY_FUNCTION(start_am33xx_phytec_phycore_sdram, r0, r1, r2) { - uint32_t fdt; + void *fdt; - fdt = (uint32_t)__dtb_am335x_phytec_phycore_start - get_runtime_offset(); + fdt = __dtb_am335x_phytec_phycore_start - get_runtime_offset(); barebox_arm_entry(0x80000000, SZ_512M, fdt); } diff --git a/arch/arm/boards/phytec-phycore-imx27/lowlevel.c b/arch/arm/boards/phytec-phycore-imx27/lowlevel.c index 4f55af8264..16b916ba0d 100644 --- a/arch/arm/boards/phytec-phycore-imx27/lowlevel.c +++ b/arch/arm/boards/phytec-phycore-imx27/lowlevel.c @@ -100,5 +100,5 @@ void __bare_init __naked barebox_arm_reset_vector(void) imx27_barebox_boot_nand_external(0); } out: - imx27_barebox_entry(0); + imx27_barebox_entry(NULL); } diff --git a/arch/arm/boards/phytec-phycore-imx31/lowlevel.c b/arch/arm/boards/phytec-phycore-imx31/lowlevel.c index cd894c25ce..44fc5bc765 100644 --- a/arch/arm/boards/phytec-phycore-imx31/lowlevel.c +++ b/arch/arm/boards/phytec-phycore-imx31/lowlevel.c @@ -84,7 +84,7 @@ void __bare_init __naked barebox_arm_reset_vector(void) /* Skip SDRAM initialization if we run from RAM */ r = get_pc(); if (r > 0x80000000 && r < 0xa0000000) - imx31_barebox_entry(0); + imx31_barebox_entry(NULL); #if defined CONFIG_PCM037_SDRAM_BANK0_128MB #define ROWS0 ESDCTL0_ROW13 @@ -131,6 +131,6 @@ void __bare_init __naked barebox_arm_reset_vector(void) imx31_barebox_boot_nand_external(0); } else { - imx31_barebox_entry(0); + imx31_barebox_entry(NULL); } } diff --git a/arch/arm/boards/phytec-phycore-imx35/lowlevel.c b/arch/arm/boards/phytec-phycore-imx35/lowlevel.c index 8376bb4f00..919a9af3da 100644 --- a/arch/arm/boards/phytec-phycore-imx35/lowlevel.c +++ b/arch/arm/boards/phytec-phycore-imx35/lowlevel.c @@ -196,5 +196,5 @@ void __bare_init __naked barebox_arm_reset_vector(void) } out: - imx35_barebox_entry(0); + imx35_barebox_entry(NULL); } diff --git a/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c index 4f39600436..8ea62c7f56 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c +++ b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c @@ -122,5 +122,5 @@ void __bare_init __naked barebox_arm_reset_vector(uint32_t *data) pcm049_init_lowlevel(); out: - barebox_arm_entry(0x80000000, SZ_512M, 0); + barebox_arm_entry(0x80000000, SZ_512M, NULL); } diff --git a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c index fb7b186d21..6c6f660d85 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c +++ b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c @@ -59,7 +59,7 @@ extern char __dtb_imx6s_phytec_pbab01_start[]; ENTRY_FUNCTION(start_phytec_pbab01_1gib, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); @@ -68,14 +68,14 @@ ENTRY_FUNCTION(start_phytec_pbab01_1gib, r0, r1, r2) if (IS_ENABLED(CONFIG_DEBUG_LL)) setup_uart(); - fdt = (uint32_t)__dtb_imx6q_phytec_pbab01_start - get_runtime_offset(); + fdt = __dtb_imx6q_phytec_pbab01_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } ENTRY_FUNCTION(start_phytec_pbab01_2gib, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); @@ -84,14 +84,14 @@ ENTRY_FUNCTION(start_phytec_pbab01_2gib, r0, r1, r2) if (IS_ENABLED(CONFIG_DEBUG_LL)) setup_uart(); - fdt = (uint32_t)__dtb_imx6q_phytec_pbab01_start - get_runtime_offset(); + fdt = __dtb_imx6q_phytec_pbab01_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_2G, fdt); } ENTRY_FUNCTION(start_phytec_pbab01_4gib, r0, r1, r2) { - uint32_t fdt; + void *fdt; __barebox_arm_head(); @@ -99,14 +99,14 @@ ENTRY_FUNCTION(start_phytec_pbab01_4gib, r0, r1, r2) arm_setup_stack(0x00920000 - 8); - fdt = (uint32_t)__dtb_imx6q_phytec_pbab01_start - get_runtime_offset(); + fdt = __dtb_imx6q_phytec_pbab01_start - get_runtime_offset(); barebox_arm_entry(0x10000000, 0xEFFFFFF8, fdt); } ENTRY_FUNCTION(start_phytec_pbab01dl_1gib, r0, r1, r2) { - uint32_t fdt; + void *fdt; __barebox_arm_head(); @@ -114,14 +114,14 @@ ENTRY_FUNCTION(start_phytec_pbab01dl_1gib, r0, r1, r2) arm_setup_stack(0x00920000 - 8); - fdt = (uint32_t)__dtb_imx6dl_phytec_pbab01_start - get_runtime_offset(); + fdt = __dtb_imx6dl_phytec_pbab01_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } ENTRY_FUNCTION(start_phytec_pbab01s_512mb, r0, r1, r2) { - uint32_t fdt; + void *fdt; __barebox_arm_head(); @@ -129,7 +129,7 @@ ENTRY_FUNCTION(start_phytec_pbab01s_512mb, r0, r1, r2) arm_setup_stack(0x00920000 - 8); - fdt = (uint32_t)__dtb_imx6s_phytec_pbab01_start - get_runtime_offset(); + fdt = __dtb_imx6s_phytec_pbab01_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_512M, fdt); } diff --git a/arch/arm/boards/radxa-rock/lowlevel.c b/arch/arm/boards/radxa-rock/lowlevel.c index 0b40f10599..65014e6bb5 100644 --- a/arch/arm/boards/radxa-rock/lowlevel.c +++ b/arch/arm/boards/radxa-rock/lowlevel.c @@ -20,11 +20,11 @@ extern char __dtb_rk3188_radxarock_start[]; ENTRY_FUNCTION(start_radxa_rock, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_rk3188_radxarock_start - get_runtime_offset(); + fdt = __dtb_rk3188_radxarock_start - get_runtime_offset(); barebox_arm_entry(0x60000000, SZ_2G, fdt); } diff --git a/arch/arm/boards/raspberry-pi/lowlevel.c b/arch/arm/boards/raspberry-pi/lowlevel.c index 4c94cc92d8..022b11d29f 100644 --- a/arch/arm/boards/raspberry-pi/lowlevel.c +++ b/arch/arm/boards/raspberry-pi/lowlevel.c @@ -7,5 +7,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(BCM2835_SDRAM_BASE, SZ_128M, 0); + barebox_arm_entry(BCM2835_SDRAM_BASE, SZ_128M, NULL); } diff --git a/arch/arm/boards/solidrun-cubox/lowlevel.c b/arch/arm/boards/solidrun-cubox/lowlevel.c index 4b35731e2b..a28c2b18c5 100644 --- a/arch/arm/boards/solidrun-cubox/lowlevel.c +++ b/arch/arm/boards/solidrun-cubox/lowlevel.c @@ -25,11 +25,11 @@ extern char __dtb_dove_cubox_bb_start[]; ENTRY_FUNCTION(start_solidrun_cubox, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_dove_cubox_bb_start - get_runtime_offset(); + fdt = __dtb_dove_cubox_bb_start - get_runtime_offset(); mvebu_barebox_entry(fdt); } diff --git a/arch/arm/boards/solidrun-hummingboard/lowlevel.c b/arch/arm/boards/solidrun-hummingboard/lowlevel.c index 049a8a41be..8710d85c75 100644 --- a/arch/arm/boards/solidrun-hummingboard/lowlevel.c +++ b/arch/arm/boards/solidrun-hummingboard/lowlevel.c @@ -7,10 +7,10 @@ extern char __dtb_imx6dl_hummingboard_start[]; ENTRY_FUNCTION(start_imx6dl_hummingboard, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx6dl_hummingboard_start - get_runtime_offset(); + fdt = __dtb_imx6dl_hummingboard_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_512M, fdt); } diff --git a/arch/arm/boards/terasic-sockit/lowlevel.c b/arch/arm/boards/terasic-sockit/lowlevel.c index 0a4a923031..5b3b89a924 100644 --- a/arch/arm/boards/terasic-sockit/lowlevel.c +++ b/arch/arm/boards/terasic-sockit/lowlevel.c @@ -47,11 +47,11 @@ extern char __dtb_socfpga_cyclone5_sockit_start[]; ENTRY_FUNCTION(start_socfpga_sockit, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_socfpga_cyclone5_sockit_start - get_runtime_offset(); + fdt = __dtb_socfpga_cyclone5_sockit_start - get_runtime_offset(); barebox_arm_entry(0x0, SZ_1G, fdt); } @@ -82,7 +82,7 @@ static noinline void sockit_entry(void) puts_ll("done\n"); - barebox_arm_entry(0x0, SZ_1G, 0); + barebox_arm_entry(0x0, SZ_1G, NULL); } ENTRY_FUNCTION(start_socfpga_sockit_xload, r0, r1, r2) diff --git a/arch/arm/boards/tqma53/lowlevel.c b/arch/arm/boards/tqma53/lowlevel.c index 320a03e7b9..0a67228008 100644 --- a/arch/arm/boards/tqma53/lowlevel.c +++ b/arch/arm/boards/tqma53/lowlevel.c @@ -22,7 +22,7 @@ static inline void setup_uart(void __iomem *base) writel(0x00000001, base + 0x80); } -static void __noreturn start_imx53_tqma53_common(uint32_t fdt) +static void __noreturn start_imx53_tqma53_common(void *fdt) { if (IS_ENABLED(CONFIG_DEBUG_LL)) { writel(0x3, MX53_IOMUXC_BASE_ADDR + 0x278); @@ -36,7 +36,7 @@ static void __noreturn start_imx53_tqma53_common(uint32_t fdt) ENTRY_FUNCTION(start_imx53_mba53_512mib, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); @@ -44,14 +44,14 @@ ENTRY_FUNCTION(start_imx53_mba53_512mib, r0, r1, r2) imx53_init_lowlevel_early(800); - fdt = (uint32_t)__dtb_imx53_mba53_start - get_runtime_offset(); + fdt = __dtb_imx53_mba53_start - get_runtime_offset(); start_imx53_tqma53_common(fdt); } ENTRY_FUNCTION(start_imx53_mba53_1gib, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); @@ -59,7 +59,7 @@ ENTRY_FUNCTION(start_imx53_mba53_1gib, r0, r1, r2) imx53_init_lowlevel_early(800); - fdt = (uint32_t)__dtb_imx53_mba53_start - get_runtime_offset(); + fdt = __dtb_imx53_mba53_start - get_runtime_offset(); start_imx53_tqma53_common(fdt); } diff --git a/arch/arm/boards/tqma6x/lowlevel.c b/arch/arm/boards/tqma6x/lowlevel.c index a09a2f5671..aed95e6fc7 100644 --- a/arch/arm/boards/tqma6x/lowlevel.c +++ b/arch/arm/boards/tqma6x/lowlevel.c @@ -43,7 +43,7 @@ extern char __dtb_imx6dl_mba6x_start[]; ENTRY_FUNCTION(start_imx6q_mba6x, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); @@ -57,14 +57,14 @@ ENTRY_FUNCTION(start_imx6q_mba6x, r0, r1, r2) arm_early_mmu_cache_invalidate(); - fdt = (uint32_t)__dtb_imx6q_mba6x_start - get_runtime_offset(); + fdt = __dtb_imx6q_mba6x_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } ENTRY_FUNCTION(start_imx6dl_mba6x, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); @@ -78,7 +78,7 @@ ENTRY_FUNCTION(start_imx6dl_mba6x, r0, r1, r2) arm_early_mmu_cache_invalidate(); - fdt = (uint32_t)__dtb_imx6dl_mba6x_start - get_runtime_offset(); + fdt = __dtb_imx6dl_mba6x_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_512M, fdt); } diff --git a/arch/arm/boards/udoo/lowlevel.c b/arch/arm/boards/udoo/lowlevel.c index b54ddfec7b..5eac7a3bce 100644 --- a/arch/arm/boards/udoo/lowlevel.c +++ b/arch/arm/boards/udoo/lowlevel.c @@ -7,11 +7,11 @@ extern char __dtb_imx6q_udoo_start[]; ENTRY_FUNCTION(start_imx6_udoo, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); - fdt = (uint32_t)__dtb_imx6q_udoo_start - get_runtime_offset(); + fdt = __dtb_imx6q_udoo_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } diff --git a/arch/arm/boards/variscite-mx6/lowlevel.c b/arch/arm/boards/variscite-mx6/lowlevel.c index e93e87484c..a2c0874d80 100644 --- a/arch/arm/boards/variscite-mx6/lowlevel.c +++ b/arch/arm/boards/variscite-mx6/lowlevel.c @@ -59,7 +59,7 @@ extern char __dtb_imx6q_var_custom_start[]; ENTRY_FUNCTION(start_variscite_custom, r0, r1, r2) { - uint32_t fdt; + void *fdt; arm_cpu_lowlevel_init(); @@ -68,7 +68,7 @@ ENTRY_FUNCTION(start_variscite_custom, r0, r1, r2) if (IS_ENABLED(CONFIG_DEBUG_LL)) setup_uart(); - fdt = (uint32_t)__dtb_imx6q_var_custom_start - get_runtime_offset(); + fdt = __dtb_imx6q_var_custom_start - get_runtime_offset(); barebox_arm_entry(0x10000000, SZ_1G, fdt); } diff --git a/arch/arm/boards/versatile/lowlevel.c b/arch/arm/boards/versatile/lowlevel.c index b694c8946d..ce06f45c91 100644 --- a/arch/arm/boards/versatile/lowlevel.c +++ b/arch/arm/boards/versatile/lowlevel.c @@ -6,5 +6,5 @@ void __naked barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(0x0, SZ_64M, 0); + barebox_arm_entry(0x0, SZ_64M, NULL); } diff --git a/arch/arm/boards/vexpress/lowlevel.c b/arch/arm/boards/vexpress/lowlevel.c index a296352cf1..2ef94c59d6 100644 --- a/arch/arm/boards/vexpress/lowlevel.c +++ b/arch/arm/boards/vexpress/lowlevel.c @@ -16,7 +16,7 @@ void __naked barebox_arm_reset_vector(void) arm_cpu_lowlevel_init(); if (amba_is_arm_sp804(IOMEM(0x10011000))) - barebox_arm_entry(0x60000000, SZ_512M, 0); + barebox_arm_entry(0x60000000, SZ_512M, NULL); else - barebox_arm_entry(0x80000000, SZ_512M, 0); + barebox_arm_entry(0x80000000, SZ_512M, NULL); } diff --git a/arch/arm/boards/virt2real/lowlevel.c b/arch/arm/boards/virt2real/lowlevel.c index 3c90d78678..731e2cae64 100644 --- a/arch/arm/boards/virt2real/lowlevel.c +++ b/arch/arm/boards/virt2real/lowlevel.c @@ -30,5 +30,5 @@ void __naked __bare_init barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - barebox_arm_entry(VIRT2REAL_SRAM_BASE, VIRT2REAL_SRAM_SIZE, 0); + barebox_arm_entry(VIRT2REAL_SRAM_BASE, VIRT2REAL_SRAM_SIZE, NULL); } |