OpenWrt – Blame information for rev 2

Subversion Repositories:
Rev:
Rev Author Line No. Line
1 office 1 diff -ruN imx-bootlets-10.05.02.orig/linux_prep/board/imx23_olinuxino_dev.c imx-bootlets-10.05.02/linux_prep/board/imx23_olinuxino_dev.c
2 --- imx-bootlets-10.05.02.orig/linux_prep/board/imx23_olinuxino_dev.c 1970-01-01 01:00:00.000000000 +0100
3 +++ imx-bootlets-10.05.02/linux_prep/board/imx23_olinuxino_dev.c 2013-05-19 00:11:40.000000000 +0200
4 @@ -0,0 +1,54 @@
5 +/*
6 + * Platform specific data for the IMX23_OLINUXINO development board
7 + *
8 + * Fadil Berisha <fadil.r.berisha@gmail.com>
9 + *
10 + * Copyright 2008 SigmaTel, Inc
11 + * Copyright 2008 Embedded Alley Solutions, Inc
12 + * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
13 + *
14 + * This file is licensed under the terms of the GNU General Public License
15 + * version 2. This program is licensed "as is" without any warranty of any
16 + * kind, whether express or implied.
17 + *
18 + * http://www.opensource.org/licenses/gpl-license.html
19 + * http://www.gnu.org/copyleft/gpl.html
20 + */
21 +#include <setup.h>
22 +#include <keys.h>
23 +#include <lradc_buttons.h>
24 +
25 +/************************************************
26 + * LRADC keyboard data *
27 + ************************************************/
28 +int lradc_keypad_ch = LRADC_CH0;
29 +int lradc_vddio_ch = LRADC_CH6;
30 +
31 +struct lradc_keycode lradc_keycodes[] = {
32 + { 100, KEY4 },
33 + { 306, KEY5 },
34 + { 601, KEY6 },
35 + { 932, KEY7 },
36 + { 1260, KEY8 },
37 + { 1424, KEY9 },
38 + { 1707, KEY10 },
39 + { 2207, KEY11 },
40 + { 2525, KEY12 },
41 + { 2831, KEY13 },
42 + { 3134, KEY14 },
43 + { -1, 0 },
44 +};
45 +
46 +/************************************************
47 + * Magic key combinations for Armadillo *
48 + ************************************************/
49 +u32 magic_keys[MAGIC_KEY_NR] = {
50 + [MAGIC_KEY1] = KEY4,
51 + [MAGIC_KEY2] = KEY6,
52 + [MAGIC_KEY3] = KEY10,
53 +};
54 +
55 +/************************************************
56 + * Default command line *
57 + ************************************************/
58 +char cmdline_def[] = "console=ttyAMA0,115200";
59 diff -ruN imx-bootlets-10.05.02.orig/linux_prep/cmdlines/imx23_olinuxino_dev.txt imx-bootlets-10.05.02/linux_prep/cmdlines/imx23_olinuxino_dev.txt
60 --- imx-bootlets-10.05.02.orig/linux_prep/cmdlines/imx23_olinuxino_dev.txt 1970-01-01 01:00:00.000000000 +0100
61 +++ imx-bootlets-10.05.02/linux_prep/cmdlines/imx23_olinuxino_dev.txt 2013-05-19 00:12:56.000000000 +0200
62 @@ -0,0 +1 @@
63 +noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
64 diff -ruN imx-bootlets-10.05.02.orig/linux_prep/core/setup.c imx-bootlets-10.05.02/linux_prep/core/setup.c
65 --- imx-bootlets-10.05.02.orig/linux_prep/core/setup.c 2010-05-14 06:56:28.000000000 +0200
66 +++ imx-bootlets-10.05.02/linux_prep/core/setup.c 2013-05-19 00:11:40.000000000 +0200
67 @@ -84,6 +84,8 @@
68 #include "../../mach-mx28/includes/registers/regsrtc.h"
69 #elif defined(STMP378X)
70 #include "../../mach-mx23/includes/registers/regsrtc.h"
71 +#elif defined(IMX23_OLINUXINO)
72 +#include "../../mach-mx23/includes/registers/regsrtc.h"
73 #endif
74  
75 #define NAND_SECONDARY_BOOT 0x00000002
76 diff -ruN imx-bootlets-10.05.02.orig/linux_prep/include/mx23/platform.h imx-bootlets-10.05.02/linux_prep/include/mx23/platform.h
77 --- imx-bootlets-10.05.02.orig/linux_prep/include/mx23/platform.h 2010-05-14 06:56:28.000000000 +0200
78 +++ imx-bootlets-10.05.02/linux_prep/include/mx23/platform.h 2013-05-19 00:11:40.000000000 +0200
79 @@ -19,6 +19,10 @@
80  
81 #if defined (BOARD_STMP378X_DEV)
82 #define MACHINE_ID 0xa45
83 +
84 +#elif defined (BOARD_IMX23_OLINUXINO_DEV)
85 +#define MACHINE_ID 0x1009
86 +
87 #else
88 #error "Allocate a machine ID for your board"
89 #endif
90 diff -ruN imx-bootlets-10.05.02.orig/linux_prep/Makefile imx-bootlets-10.05.02/linux_prep/Makefile
91 --- imx-bootlets-10.05.02.orig/linux_prep/Makefile 2010-05-14 06:56:28.000000000 +0200
92 +++ imx-bootlets-10.05.02/linux_prep/Makefile 2013-05-19 00:11:40.000000000 +0200
93 @@ -69,6 +69,11 @@
94 HW_OBJS = $(LRADC_OBJS)
95 CFLAGS += -DMX28 -DBOARD_MX28_EVK
96 endif
97 +ifeq ($(BOARD), imx23_olinuxino_dev)
98 +ARCH = mx23
99 +HW_OBJS = $(LRADC_OBJS)
100 +CFLAGS += -DIMX23_OLINUXINO -DBOARD_IMX23_OLINUXINO_DEV
101 +endif
102  
103 # Generic code
104 CORE_OBJS = entry.o resume.o cmdlines.o setup.o keys.o
105 diff -ruN imx-bootlets-10.05.02.orig/Makefile imx-bootlets-10.05.02/Makefile
106 --- imx-bootlets-10.05.02.orig/Makefile 2010-05-14 06:56:28.000000000 +0200
107 +++ imx-bootlets-10.05.02/Makefile 2013-05-19 00:15:02.000000000 +0200
108 @@ -3,9 +3,9 @@
109 export MEM_TYPE
110  
111 DFT_IMAGE=$(DEV_IMAGE)/boot/zImage
112 -DFT_UBOOT=$(DEV_IMAGE)/boot/u-boot
113 +DFT_UBOOT=../boot/u-boot
114  
115 -BOARD ?= stmp378x_dev
116 +BOARD ?= imx23_olinuxino_dev
117  
118 ifeq ($(BOARD), stmp37xx_dev)
119 ARCH = 37xx
120 @@ -16,6 +16,9 @@
121 ifeq ($(BOARD), iMX28_EVK)
122 ARCH = mx28
123 endif
124 +ifeq ($(BOARD), imx23_olinuxino_dev)
125 +ARCH = mx23
126 +endif
127  
128 all: build_prep gen_bootstream
129  
130 @@ -93,6 +96,8 @@
131 clean:
132 -rm -rf *.sb
133 rm -f sd_mmc_bootstream.raw
134 + rm -f linux_prep/board/*.o
135 + rm -f power_prep/*.o
136 $(MAKE) -C linux_prep clean ARCH=$(ARCH)
137 $(MAKE) -C boot_prep clean ARCH=$(ARCH)
138 $(MAKE) -C power_prep clean ARCH=$(ARCH)
139 diff -ruN imx-bootlets-10.05.02.orig/uboot.db imx-bootlets-10.05.02/uboot.db
140 --- imx-bootlets-10.05.02.orig/uboot.db 2010-05-14 06:56:28.000000000 +0200
141 +++ imx-bootlets-10.05.02/uboot.db 2013-05-19 00:11:40.000000000 +0200
142 @@ -3,7 +3,7 @@
143 sources {
144 power_prep="./power_prep/power_prep";
145 sdram_prep="./boot_prep/boot_prep";
146 - image="/home/b18647/repos/ltib_latest/rootfs/boot/u-boot";
147 + image="../boot/u-boot";
148 }
149  
150 section (0) {