diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:19:41 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-04 17:19:41 +0200 |
| commit | 8da9a22b522f2b89f51f57b96295941c059e9c9d (patch) | |
| tree | c51cb4a4d67e655fb3084c93280340cb6e70efb8 /arch/arm/boards/freescale-mx6-sabrelite | |
| parent | ca7a800c1f713f0b01750746dd034fbb1b1321cc (diff) | |
| parent | f3127d1c1f64aa7f748ce4e30d7c8a6314ce83a4 (diff) | |
| download | barebox-8da9a22b522f2b89f51f57b96295941c059e9c9d.tar.gz barebox-8da9a22b522f2b89f51f57b96295941c059e9c9d.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/boards/freescale-mx6-sabrelite')
| -rw-r--r-- | arch/arm/boards/freescale-mx6-sabrelite/board.c | 13 | ||||
| -rw-r--r-- | arch/arm/boards/freescale-mx6-sabrelite/env/config-board | 6 |
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index 178fed6fd2..1f26548058 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c @@ -179,20 +179,9 @@ static int sabrelite_coredevices_init(void) phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK, ksz9021rn_phy_fixup); - return 0; -} -coredevice_initcall(sabrelite_coredevices_init); - -static int sabrelite_postcore_init(void) -{ - if (!of_machine_is_compatible("fsl,imx6q-sabrelite") && - !of_machine_is_compatible("fsl,imx6dl-sabrelite")) - return 0; - - imx6_init_lowlevel(); barebox_set_hostname("sabrelite"); return 0; } -postcore_initcall(sabrelite_postcore_init); +coredevice_initcall(sabrelite_coredevices_init); diff --git a/arch/arm/boards/freescale-mx6-sabrelite/env/config-board b/arch/arm/boards/freescale-mx6-sabrelite/env/config-board deleted file mode 100644 index 4cabac63dd..0000000000 --- a/arch/arm/boards/freescale-mx6-sabrelite/env/config-board +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# board defaults, do not change in running system. Change /env/config -# instead - -global.linux.bootargs.base="console=ttymxc1,115200" |