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/boundarydevices-nitrogen6x | |
| 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/boundarydevices-nitrogen6x')
| -rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6x/board.c | 16 | ||||
| -rw-r--r-- | arch/arm/boards/boundarydevices-nitrogen6x/env/config-board | 6 |
2 files changed, 2 insertions, 20 deletions
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/board.c b/arch/arm/boards/boundarydevices-nitrogen6x/board.c index 95c8567673..347fd9128b 100644 --- a/arch/arm/boards/boundarydevices-nitrogen6x/board.c +++ b/arch/arm/boards/boundarydevices-nitrogen6x/board.c @@ -29,6 +29,8 @@ static int nitrogen6x_devices_init(void) imx6_bbu_internal_spi_i2c_register_handler("spiflash", "/dev/m25p0.barebox", BBU_HANDLER_FLAG_DEFAULT); + barebox_set_hostname("nitrogen6x"); + return 0; } device_initcall(nitrogen6x_devices_init); @@ -61,17 +63,3 @@ static int nitrogen6x_coredevices_init(void) return 0; } coredevice_initcall(nitrogen6x_coredevices_init); - -static int nitrogen6x_postcore_init(void) -{ - if (!of_machine_is_compatible("fsl,imx6dl-nitrogen6x") && - !of_machine_is_compatible("fsl,imx6q-nitrogen6x")) - return 0; - - imx6_init_lowlevel(); - - barebox_set_hostname("nitrogen6x"); - - return 0; -} -postcore_initcall(nitrogen6x_postcore_init); diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/env/config-board b/arch/arm/boards/boundarydevices-nitrogen6x/env/config-board deleted file mode 100644 index 4cabac63dd..0000000000 --- a/arch/arm/boards/boundarydevices-nitrogen6x/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" |