Forward-ported patch from https://github.com/koliqi/imx23-olinuxino for mxs-bootlets-10.12.01 Signed-off-by: Gustavo Zacarias diff -Nura imx-bootlets-src-10.12.01/linux_prep/board/imx23_olinuxino_dev.c imx-bootlets-src-10.12.01-olinuxino/linux_prep/board/imx23_olinuxino_dev.c --- imx-bootlets-src-10.12.01/linux_prep/board/imx23_olinuxino_dev.c 1969-12-31 21:00:00.000000000 -0300 +++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/board/imx23_olinuxino_dev.c 2013-05-17 15:07:33.282961551 -0300 @@ -0,0 +1,54 @@ +/* + * Platform specific data for the IMX23_OLINUXINO development board + * + * Fadil Berisha + * + * Copyright 2008 SigmaTel, Inc + * Copyright 2008 Embedded Alley Solutions, Inc + * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved. + * + * This file is licensed under the terms of the GNU General Public License + * version 2. This program is licensed "as is" without any warranty of any + * kind, whether express or implied. + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ +#include +#include +#include + +/************************************************ + * LRADC keyboard data * + ************************************************/ +int lradc_keypad_ch = LRADC_CH0; +int lradc_vddio_ch = LRADC_CH6; + +struct lradc_keycode lradc_keycodes[] = { + { 100, KEY4 }, + { 306, KEY5 }, + { 601, KEY6 }, + { 932, KEY7 }, + { 1260, KEY8 }, + { 1424, KEY9 }, + { 1707, KEY10 }, + { 2207, KEY11 }, + { 2525, KEY12 }, + { 2831, KEY13 }, + { 3134, KEY14 }, + { -1, 0 }, +}; + +/************************************************ + * Magic key combinations for Armadillo * + ************************************************/ +u32 magic_keys[MAGIC_KEY_NR] = { + [MAGIC_KEY1] = KEY4, + [MAGIC_KEY2] = KEY6, + [MAGIC_KEY3] = KEY10, +}; + +/************************************************ + * Default command line * + ************************************************/ +char cmdline_def[] = "console=ttyAMA0,115200"; diff -Nura imx-bootlets-src-10.12.01/linux_prep/cmdlines/imx23_olinuxino_dev.txt imx-bootlets-src-10.12.01-olinuxino/linux_prep/cmdlines/imx23_olinuxino_dev.txt --- imx-bootlets-src-10.12.01/linux_prep/cmdlines/imx23_olinuxino_dev.txt 1969-12-31 21:00:00.000000000 -0300 +++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/cmdlines/imx23_olinuxino_dev.txt 2013-05-17 15:07:49.663496106 -0300 @@ -0,0 +1,3 @@ +noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc +noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc +noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc diff -Nura imx-bootlets-src-10.12.01/linux_prep/core/setup.c imx-bootlets-src-10.12.01-olinuxino/linux_prep/core/setup.c --- imx-bootlets-src-10.12.01/linux_prep/core/setup.c 2010-11-04 04:35:38.000000000 -0300 +++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/core/setup.c 2013-05-17 15:08:39.246114205 -0300 @@ -84,6 +84,8 @@ #include "../../mach-mx28/includes/registers/regsrtc.h" #elif defined(STMP378X) #include "../../mach-mx23/includes/registers/regsrtc.h" +#elif defined(IMX23_OLINUXINO) +#include "../../mach-mx23/includes/registers/regsrtc.h" #endif #define NAND_SECONDARY_BOOT 0x00000002 diff -Nura imx-bootlets-src-10.12.01/linux_prep/include/mx23/platform.h imx-bootlets-src-10.12.01-olinuxino/linux_prep/include/mx23/platform.h --- imx-bootlets-src-10.12.01/linux_prep/include/mx23/platform.h 2010-11-04 04:35:38.000000000 -0300 +++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/include/mx23/platform.h 2013-05-17 15:09:21.006476997 -0300 @@ -19,6 +19,8 @@ #if defined (BOARD_STMP378X_DEV) #define MACHINE_ID 0xa45 +#elif defined (BOARD_IMX23_OLINUXINO_DEV) +#define MACHINE_ID 0x1009 #else #error "Allocate a machine ID for your board" #endif diff -Nura imx-bootlets-src-10.12.01/linux_prep/Makefile imx-bootlets-src-10.12.01-olinuxino/linux_prep/Makefile --- imx-bootlets-src-10.12.01/linux_prep/Makefile 2010-11-04 04:35:38.000000000 -0300 +++ imx-bootlets-src-10.12.01-olinuxino/linux_prep/Makefile 2013-05-17 15:09:53.554539143 -0300 @@ -69,6 +69,11 @@ HW_OBJS = $(LRADC_OBJS) CFLAGS += -DMX28 -DBOARD_MX28_EVK endif +ifeq ($(BOARD), imx23_olinuxino_dev) +ARCH = mx23 +HW_OBJS = $(LRADC_OBJS) +CFLAGS += -DIMX23_OLINUXINO -DBOARD_IMX23_OLINUXINO_DEV +endif # Generic code CORE_OBJS = entry.o resume.o cmdlines.o setup.o keys.o diff -Nura imx-bootlets-src-10.12.01/Makefile imx-bootlets-src-10.12.01-olinuxino/Makefile --- imx-bootlets-src-10.12.01/Makefile 2010-11-04 04:35:38.000000000 -0300 +++ imx-bootlets-src-10.12.01-olinuxino/Makefile 2013-05-17 15:23:53.709956619 -0300 @@ -16,6 +16,9 @@ ifeq ($(BOARD), iMX28_EVK) ARCH = mx28 endif +ifeq ($(BOARD), imx23_olinuxino_dev) +ARCH = mx23 +endif all: build_prep gen_bootstream