diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-10-23 00:40:28 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-10-28 09:41:03 +0100 |
commit | d118bc314f2889c52686951165576181b6a4adc8 (patch) | |
tree | 44296d48d45dadac590ddfc1ccc9f411bcc069c4 /board | |
parent | 5ac6f1a430e370828947a8342778c751bf0cb476 (diff) |
apalis/colibri_t30: migrate and integrate new update concept
Migrate Apalis/Colibri T30 to U-Boot 2014.10 and integrate new update
concept based on Apalis/Colibri iMX6 and Colibri VF50/VF61.
Diffstat (limited to 'board')
-rw-r--r-- | board/toradex/apalis_t30/MAINTAINERS | 1 | ||||
-rw-r--r-- | board/toradex/apalis_t30/Makefile | 3 | ||||
-rw-r--r-- | board/toradex/apalis_t30/apalis_t30.c | 35 | ||||
-rw-r--r-- | board/toradex/apalis_t30/pinmux-config-apalis_t30.h | 2 | ||||
-rw-r--r-- | board/toradex/colibri_t30/MAINTAINERS | 1 | ||||
-rw-r--r-- | board/toradex/colibri_t30/Makefile | 3 | ||||
-rw-r--r-- | board/toradex/colibri_t30/colibri_t30.c | 22 | ||||
-rw-r--r-- | board/toradex/colibri_t30/pinmux-config-colibri_t30.h | 2 |
8 files changed, 58 insertions, 11 deletions
diff --git a/board/toradex/apalis_t30/MAINTAINERS b/board/toradex/apalis_t30/MAINTAINERS index 01bc73e46d5..a1e707d4f4d 100644 --- a/board/toradex/apalis_t30/MAINTAINERS +++ b/board/toradex/apalis_t30/MAINTAINERS @@ -1,5 +1,6 @@ Apalis T30 M: Marcel Ziswiler <marcel.ziswiler@toradex.com> +M: Toradex ARM Support <support.arm@toradex.com> S: Maintained F: board/toradex/apalis_t30/ F: include/configs/apalis_t30.h diff --git a/board/toradex/apalis_t30/Makefile b/board/toradex/apalis_t30/Makefile index a968e6b79e4..95cdf169805 100644 --- a/board/toradex/apalis_t30/Makefile +++ b/board/toradex/apalis_t30/Makefile @@ -1,6 +1,7 @@ -# Copyright (c) 2014 Marcel Ziswiler +# Copyright (c) 2012-2014 Toradex, Inc. # SPDX-License-Identifier: GPL-2.0+ include $(srctree)/board/nvidia/common/common.mk obj-y += apalis_t30.o +obj-y += ../common/configblock.o diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c index b9d694a2688..dde1b639525 100644 --- a/board/toradex/apalis_t30/apalis_t30.c +++ b/board/toradex/apalis_t30/apalis_t30.c @@ -1,6 +1,5 @@ /* - * (C) Copyright 2014 - * Marcel Ziswiler <marcel@ziswiler.com> + * Copyright (c) 2012-2014 Toradex, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -14,10 +13,42 @@ #include <netdev.h> #include "pinmux-config-apalis_t30.h" +#include "../common/configblock.h" + +DECLARE_GLOBAL_DATA_PTR; #define PMU_I2C_ADDRESS 0x2D #define MAX_I2C_RETRY 3 +int arch_misc_init(void) +{ + /* Default memory arguments */ + if (!getenv("memargs")) { + switch (gd->ram_size) { + case 0x40000000: + /* 1 GB */ + setenv("memargs", "vmalloc=128M mem=1012M@2048M " + "fbmem=12M@3060M"); + break; + case 0x7ff00000: + case 0x80000000: + /* 2 GB */ + setenv("memargs", "vmalloc=256M mem=2035M@2048M " + "fbmem=12M@4083M"); + break; + default: + printf("Failed detecting RAM size.\n"); + } + } + +#ifdef CONFIG_TRDX_CFG_BLOCK + if (read_trdx_cfg_block()) + printf("Missing Apalis config block\n"); +#endif + + return 0; +} + /* * Routine: pinmux_init * Description: Do individual peripheral pinmux configs diff --git a/board/toradex/apalis_t30/pinmux-config-apalis_t30.h b/board/toradex/apalis_t30/pinmux-config-apalis_t30.h index c988d395c19..f672d7ae545 100644 --- a/board/toradex/apalis_t30/pinmux-config-apalis_t30.h +++ b/board/toradex/apalis_t30/pinmux-config-apalis_t30.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Marcel Ziswiler + * Copyright (c) 2012-2014, Toradex, Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, diff --git a/board/toradex/colibri_t30/MAINTAINERS b/board/toradex/colibri_t30/MAINTAINERS index 73b8e5d099d..21e235a25e1 100644 --- a/board/toradex/colibri_t30/MAINTAINERS +++ b/board/toradex/colibri_t30/MAINTAINERS @@ -1,5 +1,6 @@ Colibri T30 M: Stefan Agner <stefan.agner@toradex.com> +M: Toradex ARM Support <support.arm@toradex.com> S: Maintained F: board/toradex/colibri_t30/ F: include/configs/colibri_t30.h diff --git a/board/toradex/colibri_t30/Makefile b/board/toradex/colibri_t30/Makefile index 3d58a4b2c1c..c69af289cae 100644 --- a/board/toradex/colibri_t30/Makefile +++ b/board/toradex/colibri_t30/Makefile @@ -1,6 +1,7 @@ -# Copyright (c) 2013-2014 Stefan Agner +# Copyright (c) 2012-2014 Toradex, Inc. # SPDX-License-Identifier: GPL-2.0+ include $(srctree)/board/nvidia/common/common.mk obj-y += colibri_t30.o +obj-y += ../common/configblock.o diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c index f4bc7d8728e..cef795773b3 100644 --- a/board/toradex/colibri_t30/colibri_t30.c +++ b/board/toradex/colibri_t30/colibri_t30.c @@ -1,16 +1,28 @@ /* - * (C) Copyright 2014 - * Stefan Agner <stefan@agner.ch> + * Copyright (c) 2012-2014 Toradex, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> -#include <asm/arch/pinmux.h> + #include <asm/arch/gp_padctrl.h> -#include "pinmux-config-colibri_t30.h" -#include <i2c.h> +#include <asm/arch/pinmux.h> #include <asm/gpio.h> +#include <i2c.h> + +#include "pinmux-config-colibri_t30.h" +#include "../common/configblock.h" + +int arch_misc_init(void) +{ +#ifdef CONFIG_TRDX_CFG_BLOCK + if (read_trdx_cfg_block()) + printf("Missing Colibri config block\n"); +#endif + + return 0; +} /* * Routine: pinmux_init diff --git a/board/toradex/colibri_t30/pinmux-config-colibri_t30.h b/board/toradex/colibri_t30/pinmux-config-colibri_t30.h index 4e73c0762e0..20bb42f785b 100644 --- a/board/toradex/colibri_t30/pinmux-config-colibri_t30.h +++ b/board/toradex/colibri_t30/pinmux-config-colibri_t30.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014, Stefan Agner + * Copyright (c) 2012-2014, Toradex, Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, |