summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/gk802
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-04 17:19:41 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-04 17:19:41 +0200
commit8da9a22b522f2b89f51f57b96295941c059e9c9d (patch)
treec51cb4a4d67e655fb3084c93280340cb6e70efb8 /arch/arm/boards/gk802
parentca7a800c1f713f0b01750746dd034fbb1b1321cc (diff)
parentf3127d1c1f64aa7f748ce4e30d7c8a6314ce83a4 (diff)
downloadbarebox-8da9a22b522f2b89f51f57b96295941c059e9c9d.tar.gz
barebox-8da9a22b522f2b89f51f57b96295941c059e9c9d.tar.xz
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/boards/gk802')
-rw-r--r--arch/arm/boards/gk802/board.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/boards/gk802/board.c b/arch/arm/boards/gk802/board.c
index facb92384f..9dd22533fc 100644
--- a/arch/arm/boards/gk802/board.c
+++ b/arch/arm/boards/gk802/board.c
@@ -69,19 +69,8 @@ static int gk802_env_init(void)
devfs_add_partition(bootsource_name, 0x00000, SZ_512K, DEVFS_PARTITION_FIXED, barebox_name);
devfs_add_partition(bootsource_name, SZ_512K, SZ_512K, DEVFS_PARTITION_FIXED, default_environment_name);
- return 0;
-}
-late_initcall(gk802_env_init);
-
-static int gk802_console_init(void)
-{
- if (!of_machine_is_compatible("zealz,imx6q-gk802"))
- return 0;
-
barebox_set_hostname("gk802");
- imx6_init_lowlevel();
-
return 0;
}
-postcore_initcall(gk802_console_init);
+late_initcall(gk802_env_init);