summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2013-09-29 21:59:32 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-10-02 10:24:04 +0200
commitc05a80c825502b5577ba6d3e014a884181513bad (patch)
treea51264cbc2521291f80d91553898f5e7160afd2d
parent02568520ee4626840f37acfb612e060b13f01dfc (diff)
downloadbarebox-c05a80c825502b5577ba6d3e014a884181513bad.tar.gz
barebox-c05a80c825502b5577ba6d3e014a884181513bad.tar.xz
tegra: fix PBL build
Drop useless BUG(), we are too early for them to be of any use. Make sure we build the AVP code as ARMv4 even in PBL case. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-tegra/Makefile1
-rw-r--r--arch/arm/mach-tegra/tegra_avp_init.c4
-rw-r--r--arch/arm/mach-tegra/tegra_maincomplex_init.c2
3 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index fd6a870707..0fa843022b 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -1,4 +1,5 @@
CFLAGS_tegra_avp_init.o := -mcpu=arm7tdmi -march=armv4t
+CFLAGS_pbl-tegra_avp_init.o := -mcpu=arm7tdmi -march=armv4t
lwl-y += tegra_avp_init.o
lwl-y += tegra_maincomplex_init.o
obj-y += tegra20.o
diff --git a/arch/arm/mach-tegra/tegra_avp_init.c b/arch/arm/mach-tegra/tegra_avp_init.c
index ba275ad1f6..557af666a7 100644
--- a/arch/arm/mach-tegra/tegra_avp_init.c
+++ b/arch/arm/mach-tegra/tegra_avp_init.c
@@ -109,8 +109,6 @@ static void init_pllx(void)
return;
chiptype = tegra_get_chiptype();
- if (chiptype < 0)
- BUG();
osc_freq = (readl(TEGRA_CLK_RESET_BASE + CRC_OSC_CTRL) &
CRC_OSC_CTRL_OSC_FREQ_MASK) >> CRC_OSC_CTRL_OSC_FREQ_SHIFT;
@@ -197,8 +195,6 @@ void barebox_arm_reset_vector(void)
/* get the number of cores in the main CPU complex of the current SoC */
num_cores = tegra_get_num_cores();
- if (!num_cores)
- BUG();
/* bring down main CPU complex (this may be a warm boot) */
enable_maincomplex_powerrail();
diff --git a/arch/arm/mach-tegra/tegra_maincomplex_init.c b/arch/arm/mach-tegra/tegra_maincomplex_init.c
index dea9c9151d..343edd6f91 100644
--- a/arch/arm/mach-tegra/tegra_maincomplex_init.c
+++ b/arch/arm/mach-tegra/tegra_maincomplex_init.c
@@ -33,7 +33,7 @@ void tegra_maincomplex_entry(void)
break;
default:
/* If we don't know the chiptype, better bail out */
- BUG();
+ unreachable();
}
/*