diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-07 11:57:51 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-07 11:57:51 +0100 |
| commit | 8720919039ef748c19b3ae8a73aaa499b7300c7c (patch) | |
| tree | e89f0716110c888f3d5a8c7a6c294cf9e2f94ca1 /arch/arm/boards/dfi-fs700-m60 | |
| parent | dde57041228fc52a491757522a5c31e45cba8bbb (diff) | |
| parent | 8e3ddc13eb8239177ed20f119e3a3d02518b941d (diff) | |
| download | barebox-8720919039ef748c19b3ae8a73aaa499b7300c7c.tar.gz barebox-8720919039ef748c19b3ae8a73aaa499b7300c7c.tar.xz | |
Merge branch 'for-next/arm-barebox-bootm'
Diffstat (limited to 'arch/arm/boards/dfi-fs700-m60')
| -rw-r--r-- | arch/arm/boards/dfi-fs700-m60/board.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boards/dfi-fs700-m60/board.c b/arch/arm/boards/dfi-fs700-m60/board.c index 9894654bd3..96f1b0e9dc 100644 --- a/arch/arm/boards/dfi-fs700-m60/board.c +++ b/arch/arm/boards/dfi-fs700-m60/board.c @@ -72,7 +72,6 @@ static int dfi_fs700_m60_init(void) imx6_bbu_internal_mmc_register_handler("mmc", "/dev/mmc3.boot0", BBU_HANDLER_FLAG_DEFAULT, NULL, 0, 0); - armlinux_set_bootparams((void *)0x10000100); armlinux_set_architecture(MACH_TYPE_MX6Q_SABRESD); return 0; |