summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/beaglebone
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-01-07 11:57:51 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-01-07 11:57:51 +0100
commit8720919039ef748c19b3ae8a73aaa499b7300c7c (patch)
treee89f0716110c888f3d5a8c7a6c294cf9e2f94ca1 /arch/arm/boards/beaglebone
parentdde57041228fc52a491757522a5c31e45cba8bbb (diff)
parent8e3ddc13eb8239177ed20f119e3a3d02518b941d (diff)
downloadbarebox-8720919039ef748c19b3ae8a73aaa499b7300c7c.tar.gz
barebox-8720919039ef748c19b3ae8a73aaa499b7300c7c.tar.xz
Merge branch 'for-next/arm-barebox-bootm'
Diffstat (limited to 'arch/arm/boards/beaglebone')
-rw-r--r--arch/arm/boards/beaglebone/board.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c
index 6445d81001..ad0d3b3070 100644
--- a/arch/arm/boards/beaglebone/board.c
+++ b/arch/arm/boards/beaglebone/board.c
@@ -70,7 +70,6 @@ static int beaglebone_devices_init(void)
printf("detected 'BeagleBone %s'\n", black ? "Black" : "White");
- armlinux_set_bootparams((void *)0x80000100);
armlinux_set_architecture(MACH_TYPE_BEAGLEBONE);
return 0;