Remove duplicated macro calls by moving it into a common macro, as is done in ARM code. Some boards were missing this one for no good reason, it seems. Well, now they don't. Signed-off-by: Denis Orlov <denorl2009@xxxxxxxxx> --- arch/mips/boards/8devices-lima/lowlevel.S | 2 -- arch/mips/boards/dlink-dir-320/lowlevel.S | 2 -- arch/mips/boards/loongson-ls1b/lowlevel.S | 2 -- arch/mips/boards/netgear-wg102/lowlevel.S | 2 -- arch/mips/boards/qemu-malta/lowlevel.S | 1 - arch/mips/boards/tplink-wdr4300/lowlevel.S | 2 -- arch/mips/include/asm/asm.h | 4 ++-- arch/mips/mach-ath79/include/mach/pbl_macros.h | 4 ---- 8 files changed, 2 insertions(+), 17 deletions(-) diff --git a/arch/mips/boards/8devices-lima/lowlevel.S b/arch/mips/boards/8devices-lima/lowlevel.S index dd1ab6247d..8a4c77a44f 100644 --- a/arch/mips/boards/8devices-lima/lowlevel.S +++ b/arch/mips/boards/8devices-lima/lowlevel.S @@ -15,8 +15,6 @@ ENTRY_FUNCTION(BOARD_PBL_START) - mips_barebox_10h - debug_ll_ath79_init hornet_mips24k_cp0_setup diff --git a/arch/mips/boards/dlink-dir-320/lowlevel.S b/arch/mips/boards/dlink-dir-320/lowlevel.S index da969bc74e..7e496b50d1 100644 --- a/arch/mips/boards/dlink-dir-320/lowlevel.S +++ b/arch/mips/boards/dlink-dir-320/lowlevel.S @@ -13,8 +13,6 @@ ENTRY_FUNCTION(BOARD_PBL_START) - mips_barebox_10h - mips_disable_interrupts /* CPU/SoC specific setup ... */ diff --git a/arch/mips/boards/loongson-ls1b/lowlevel.S b/arch/mips/boards/loongson-ls1b/lowlevel.S index 7240d351b4..c3d46c773b 100644 --- a/arch/mips/boards/loongson-ls1b/lowlevel.S +++ b/arch/mips/boards/loongson-ls1b/lowlevel.S @@ -17,8 +17,6 @@ ENTRY_FUNCTION(BOARD_PBL_START) - mips_barebox_10h - mips_disable_interrupts pbl_blt 0xbf000000 skip_pll_ram_config t0 diff --git a/arch/mips/boards/netgear-wg102/lowlevel.S b/arch/mips/boards/netgear-wg102/lowlevel.S index e48dded269..d57b62583d 100644 --- a/arch/mips/boards/netgear-wg102/lowlevel.S +++ b/arch/mips/boards/netgear-wg102/lowlevel.S @@ -14,8 +14,6 @@ ENTRY_FUNCTION(BOARD_PBL_START) - mips_barebox_10h - mips_disable_interrupts pbl_ar2312_pll diff --git a/arch/mips/boards/qemu-malta/lowlevel.S b/arch/mips/boards/qemu-malta/lowlevel.S index d5d7480e21..8c2d82dab2 100644 --- a/arch/mips/boards/qemu-malta/lowlevel.S +++ b/arch/mips/boards/qemu-malta/lowlevel.S @@ -32,7 +32,6 @@ ENTRY_FUNCTION(BOARD_PBL_START) - mips_barebox_10h mips_disable_interrupts /* cpu specific setup ... */ diff --git a/arch/mips/boards/tplink-wdr4300/lowlevel.S b/arch/mips/boards/tplink-wdr4300/lowlevel.S index 8aed5ddcf1..01cc9fc212 100644 --- a/arch/mips/boards/tplink-wdr4300/lowlevel.S +++ b/arch/mips/boards/tplink-wdr4300/lowlevel.S @@ -15,8 +15,6 @@ ENTRY_FUNCTION(BOARD_PBL_START) - mips_barebox_10h - debug_ll_ath79_init hornet_mips24k_cp0_setup diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h index c699542a55..f6daae6757 100644 --- a/arch/mips/include/asm/asm.h +++ b/arch/mips/include/asm/asm.h @@ -83,8 +83,8 @@ symbol: .frame sp, framesize, rpc .set noreorder; \ .section .text_head_entry.symbol; \ .align 4; \ - \ -EXPORT(symbol) +EXPORT(symbol) \ + mips_barebox_10h /* * ENTRY_FUNCTION_END - mark end of entry function diff --git a/arch/mips/mach-ath79/include/mach/pbl_macros.h b/arch/mips/mach-ath79/include/mach/pbl_macros.h index f101b41708..86d2cba392 100644 --- a/arch/mips/mach-ath79/include/mach/pbl_macros.h +++ b/arch/mips/mach-ath79/include/mach/pbl_macros.h @@ -374,8 +374,6 @@ .set push .set noreorder - mips_barebox_10h - pbl_blt 0xbf000000 skip_pll_ram_config t8 hornet_mips24k_cp0_setup @@ -406,8 +404,6 @@ .set push .set noreorder - mips_barebox_10h - hornet_mips24k_cp0_setup hornet_1_1_war -- 2.41.0
