Commit b928e658f4f342d0834356ec7e37aef1b3e30829
Committed by
Tom Rini
1 parent
0c81f37d9a
Exists in
v2017.01-smarct4x
and in
30 other branches
arm: Remove versatileab board
This board has not been converted to generic board by the deadline. Remove it. Signed-off-by: Simon Glass <sjg@chromium.org>
Showing 11 changed files with 1 additions and 424 deletions Side-by-side Diff
- arch/arm/Kconfig
- arch/arm/Makefile
- arch/arm/mach-versatile/Kconfig
- board/armltd/versatile/MAINTAINERS
- board/armltd/versatile/Makefile
- board/armltd/versatile/lowlevel_init.S
- board/armltd/versatile/versatile.c
- configs/versatileab_defconfig
- configs/versatilepb_defconfig
- configs/versatileqemu_defconfig
- include/configs/versatile.h
arch/arm/Kconfig
... | ... | @@ -70,7 +70,7 @@ |
70 | 70 | |
71 | 71 | choice |
72 | 72 | prompt "Target select" |
73 | - default ARCH_VERSATILE | |
73 | + default TARGET_HIKEY | |
74 | 74 | |
75 | 75 | config ARCH_AT91 |
76 | 76 | bool "Atmel AT91" |
... | ... | @@ -227,10 +227,6 @@ |
227 | 227 | select CPU_ARM926EJS |
228 | 228 | select SUPPORT_SPL |
229 | 229 | |
230 | -config ARCH_VERSATILE | |
231 | - bool "ARM Ltd. Versatile family" | |
232 | - select CPU_ARM926EJS | |
233 | - | |
234 | 230 | config TARGET_IMX31_PHYCORE |
235 | 231 | bool "Support imx31_phycore" |
236 | 232 | select CPU_ARM1136 |
... | ... | @@ -708,8 +704,6 @@ |
708 | 704 | source "arch/arm/mach-tegra/Kconfig" |
709 | 705 | |
710 | 706 | source "arch/arm/mach-uniphier/Kconfig" |
711 | - | |
712 | -source "arch/arm/mach-versatile/Kconfig" | |
713 | 707 | |
714 | 708 | source "arch/arm/mach-zynq/Kconfig" |
715 | 709 |
arch/arm/Makefile
... | ... | @@ -58,7 +58,6 @@ |
58 | 58 | machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip |
59 | 59 | machine-$(CONFIG_TEGRA) += tegra |
60 | 60 | machine-$(CONFIG_ARCH_UNIPHIER) += uniphier |
61 | -machine-$(CONFIG_ARCH_VERSATILE) += versatile | |
62 | 61 | machine-$(CONFIG_ARCH_ZYNQ) += zynq |
63 | 62 | |
64 | 63 | machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) |
arch/arm/mach-versatile/Kconfig
board/armltd/versatile/MAINTAINERS
board/armltd/versatile/Makefile
board/armltd/versatile/lowlevel_init.S
1 | -/* | |
2 | - * Board specific setup info | |
3 | - * | |
4 | - * (C) Copyright 2003, ARM Ltd. | |
5 | - * Philippe Robin, <philippe.robin@arm.com> | |
6 | - * | |
7 | - * SPDX-License-Identifier: GPL-2.0+ | |
8 | - */ | |
9 | - | |
10 | -#include <config.h> | |
11 | - | |
12 | -/* Set up the platform, once the cpu has been initialized */ | |
13 | -.globl lowlevel_init | |
14 | -lowlevel_init: | |
15 | - | |
16 | - /* All done by Versatile's boot monitor! */ | |
17 | - mov pc, lr |
board/armltd/versatile/versatile.c
1 | -/* | |
2 | - * (C) Copyright 2002 | |
3 | - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> | |
4 | - * Marius Groeger <mgroeger@sysgo.de> | |
5 | - * | |
6 | - * (C) Copyright 2002 | |
7 | - * David Mueller, ELSOFT AG, <d.mueller@elsoft.ch> | |
8 | - * | |
9 | - * (C) Copyright 2003 | |
10 | - * Texas Instruments, <www.ti.com> | |
11 | - * Kshitij Gupta <Kshitij@ti.com> | |
12 | - * | |
13 | - * (C) Copyright 2004 | |
14 | - * ARM Ltd. | |
15 | - * Philippe Robin, <philippe.robin@arm.com> | |
16 | - * | |
17 | - * SPDX-License-Identifier: GPL-2.0+ | |
18 | - */ | |
19 | - | |
20 | -#include <common.h> | |
21 | -#include <netdev.h> | |
22 | - | |
23 | -DECLARE_GLOBAL_DATA_PTR; | |
24 | - | |
25 | -#if defined(CONFIG_SHOW_BOOT_PROGRESS) | |
26 | -void show_boot_progress(int progress) | |
27 | -{ | |
28 | - printf("Boot reached stage %d\n", progress); | |
29 | -} | |
30 | -#endif | |
31 | - | |
32 | -#define COMP_MODE_ENABLE ((unsigned int)0x0000EAEF) | |
33 | - | |
34 | -/* | |
35 | - * Miscellaneous platform dependent initialisations | |
36 | - */ | |
37 | - | |
38 | -int board_early_init_f (void) | |
39 | -{ | |
40 | - /* | |
41 | - * set clock frequency: | |
42 | - * VERSATILE_REFCLK is 32KHz | |
43 | - * VERSATILE_TIMCLK is 1MHz | |
44 | - */ | |
45 | - *(volatile unsigned int *)(VERSATILE_SCTL_BASE) |= | |
46 | - ((VERSATILE_TIMCLK << VERSATILE_TIMER1_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER2_EnSel) | | |
47 | - (VERSATILE_TIMCLK << VERSATILE_TIMER3_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel)); | |
48 | - | |
49 | - return 0; | |
50 | -} | |
51 | - | |
52 | -int board_init (void) | |
53 | -{ | |
54 | - /* arch number of Versatile Board */ | |
55 | -#ifdef CONFIG_ARCH_VERSATILE_AB | |
56 | - gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_AB; | |
57 | -#else | |
58 | - gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB; | |
59 | -#endif | |
60 | - | |
61 | - /* adress of boot parameters */ | |
62 | - gd->bd->bi_boot_params = 0x00000100; | |
63 | - | |
64 | - gd->flags = 0; | |
65 | - | |
66 | - icache_enable (); | |
67 | - | |
68 | - return 0; | |
69 | -} | |
70 | - | |
71 | - | |
72 | -int misc_init_r (void) | |
73 | -{ | |
74 | - setenv("verify", "n"); | |
75 | - return (0); | |
76 | -} | |
77 | - | |
78 | -/****************************** | |
79 | - Routine: | |
80 | - Description: | |
81 | -******************************/ | |
82 | -int dram_init (void) | |
83 | -{ | |
84 | - /* dram_init must store complete ramsize in gd->ram_size */ | |
85 | - gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, | |
86 | - PHYS_SDRAM_1_SIZE); | |
87 | - return 0; | |
88 | -} | |
89 | - | |
90 | -#ifdef CONFIG_CMD_NET | |
91 | -int board_eth_init(bd_t *bis) | |
92 | -{ | |
93 | - int rc = 0; | |
94 | -#ifdef CONFIG_SMC91111 | |
95 | - rc = smc91111_initialize(0, CONFIG_SMC91111_BASE); | |
96 | -#endif | |
97 | - return rc; | |
98 | -} | |
99 | -#endif |
configs/versatileab_defconfig
1 | -CONFIG_ARM=y | |
2 | -CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_AB" | |
3 | -# CONFIG_CMD_CONSOLE is not set | |
4 | -# CONFIG_CMD_BOOTD is not set | |
5 | -# CONFIG_CMD_RUN is not set | |
6 | -# CONFIG_CMD_IMLS is not set | |
7 | -# CONFIG_CMD_XIMG is not set | |
8 | -# CONFIG_CMD_EDITENV is not set | |
9 | -# CONFIG_CMD_ENV_EXISTS is not set | |
10 | -# CONFIG_CMD_LOADB is not set | |
11 | -# CONFIG_CMD_LOADS is not set | |
12 | -# CONFIG_CMD_FPGA is not set | |
13 | -# CONFIG_CMD_ECHO is not set | |
14 | -# CONFIG_CMD_ITEST is not set | |
15 | -# CONFIG_CMD_SOURCE is not set | |
16 | -# CONFIG_CMD_SETEXPR is not set | |
17 | -# CONFIG_CMD_NFS is not set | |
18 | -# CONFIG_CMD_MISC is not set |
configs/versatilepb_defconfig
1 | -CONFIG_ARM=y | |
2 | -CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_PB" | |
3 | -# CONFIG_CMD_CONSOLE is not set | |
4 | -# CONFIG_CMD_BOOTD is not set | |
5 | -# CONFIG_CMD_RUN is not set | |
6 | -# CONFIG_CMD_IMLS is not set | |
7 | -# CONFIG_CMD_XIMG is not set | |
8 | -# CONFIG_CMD_EDITENV is not set | |
9 | -# CONFIG_CMD_ENV_EXISTS is not set | |
10 | -# CONFIG_CMD_LOADB is not set | |
11 | -# CONFIG_CMD_LOADS is not set | |
12 | -# CONFIG_CMD_FPGA is not set | |
13 | -# CONFIG_CMD_ECHO is not set | |
14 | -# CONFIG_CMD_ITEST is not set | |
15 | -# CONFIG_CMD_SOURCE is not set | |
16 | -# CONFIG_CMD_SETEXPR is not set | |
17 | -# CONFIG_CMD_NFS is not set | |
18 | -# CONFIG_CMD_MISC is not set |
configs/versatileqemu_defconfig
1 | -CONFIG_ARM=y | |
2 | -CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB" | |
3 | -# CONFIG_CMD_CONSOLE is not set | |
4 | -# CONFIG_CMD_BOOTD is not set | |
5 | -# CONFIG_CMD_RUN is not set | |
6 | -# CONFIG_CMD_IMLS is not set | |
7 | -# CONFIG_CMD_XIMG is not set | |
8 | -# CONFIG_CMD_EDITENV is not set | |
9 | -# CONFIG_CMD_ENV_EXISTS is not set | |
10 | -# CONFIG_CMD_LOADB is not set | |
11 | -# CONFIG_CMD_LOADS is not set | |
12 | -# CONFIG_CMD_FPGA is not set | |
13 | -# CONFIG_CMD_ECHO is not set | |
14 | -# CONFIG_CMD_ITEST is not set | |
15 | -# CONFIG_CMD_SOURCE is not set | |
16 | -# CONFIG_CMD_SETEXPR is not set | |
17 | -# CONFIG_CMD_NFS is not set | |
18 | -# CONFIG_CMD_MISC is not set |
include/configs/versatile.h
1 | -/* | |
2 | - * (C) Copyright 2003 | |
3 | - * Texas Instruments. | |
4 | - * Kshitij Gupta <kshitij@ti.com> | |
5 | - * Configuation settings for the TI OMAP Innovator board. | |
6 | - * | |
7 | - * (C) Copyright 2004 | |
8 | - * ARM Ltd. | |
9 | - * Philippe Robin, <philippe.robin@arm.com> | |
10 | - * Configuration for Versatile PB. | |
11 | - * | |
12 | - * SPDX-License-Identifier: GPL-2.0+ | |
13 | - */ | |
14 | - | |
15 | -#ifndef __CONFIG_H | |
16 | -#define __CONFIG_H | |
17 | - | |
18 | -/* | |
19 | - * High Level Configuration Options | |
20 | - * (easy to change) | |
21 | - */ | |
22 | -#define CONFIG_VERSATILE 1 /* This is Versatile Platform Board */ | |
23 | -#define CONFIG_ARCH_VERSATILE 1 /* Specifically, a Versatile */ | |
24 | - | |
25 | -#define CONFIG_SYS_MEMTEST_START 0x100000 | |
26 | -#define CONFIG_SYS_MEMTEST_END 0x10000000 | |
27 | - | |
28 | -#define CONFIG_SYS_TIMERBASE 0x101E2000 /* Timer 0 and 1 base */ | |
29 | -#define CONFIG_SYS_TIMER_RATE (1000000 / 256) | |
30 | -#define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMERBASE + 0x4) | |
31 | -#define CONFIG_SYS_TIMER_COUNTS_DOWN | |
32 | - | |
33 | -/* | |
34 | - * control registers | |
35 | - */ | |
36 | -#define VERSATILE_SCTL_BASE 0x101E0000 /* System controller */ | |
37 | - | |
38 | -/* | |
39 | - * System controller bit assignment | |
40 | - */ | |
41 | -#define VERSATILE_REFCLK 0 | |
42 | -#define VERSATILE_TIMCLK 1 | |
43 | - | |
44 | -#define VERSATILE_TIMER1_EnSel 15 | |
45 | -#define VERSATILE_TIMER2_EnSel 17 | |
46 | -#define VERSATILE_TIMER3_EnSel 19 | |
47 | -#define VERSATILE_TIMER4_EnSel 21 | |
48 | - | |
49 | -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ | |
50 | -#define CONFIG_SETUP_MEMORY_TAGS 1 | |
51 | -#define CONFIG_MISC_INIT_R 1 | |
52 | -/* | |
53 | - * Size of malloc() pool | |
54 | - */ | |
55 | -#define CONFIG_ENV_SIZE 8192 | |
56 | -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) | |
57 | - | |
58 | -/* | |
59 | - * Hardware drivers | |
60 | - */ | |
61 | - | |
62 | -#define CONFIG_SMC91111 | |
63 | -#define CONFIG_SMC_USE_32_BIT | |
64 | -#define CONFIG_SMC91111_BASE 0x10010000 | |
65 | -#undef CONFIG_SMC91111_EXT_PHY | |
66 | - | |
67 | -/* | |
68 | - * NS16550 Configuration | |
69 | - */ | |
70 | -#define CONFIG_PL011_SERIAL | |
71 | -#define CONFIG_PL011_CLOCK 24000000 | |
72 | -#define CONFIG_PL01x_PORTS \ | |
73 | - {(void *)CONFIG_SYS_SERIAL0, \ | |
74 | - (void *)CONFIG_SYS_SERIAL1 } | |
75 | -#define CONFIG_CONS_INDEX 0 | |
76 | - | |
77 | -#define CONFIG_BAUDRATE 38400 | |
78 | -#define CONFIG_SYS_SERIAL0 0x101F1000 | |
79 | -#define CONFIG_SYS_SERIAL1 0x101F2000 | |
80 | - | |
81 | -/* | |
82 | - * Command line configuration. | |
83 | - */ | |
84 | -#define CONFIG_CMD_DHCP | |
85 | -#define CONFIG_CMD_PING | |
86 | - | |
87 | -/* | |
88 | - * BOOTP options | |
89 | - */ | |
90 | -#define CONFIG_BOOTP_BOOTPATH | |
91 | -#define CONFIG_BOOTP_GATEWAY | |
92 | -#define CONFIG_BOOTP_HOSTNAME | |
93 | -#define CONFIG_BOOTP_SUBNETMASK | |
94 | - | |
95 | -#define CONFIG_BOOTDELAY 2 | |
96 | -#define CONFIG_BOOTARGS "root=/dev/nfs mem=128M ip=dhcp "\ | |
97 | - "netdev=25,0,0xf1010000,0xf1010010,eth0 "\ | |
98 | - "console=ttyAMA0,38400n1" | |
99 | - | |
100 | -/* | |
101 | - * Static configuration when assigning fixed address | |
102 | - */ | |
103 | -#define CONFIG_BOOTFILE "/tftpboot/uImage" /* file to load */ | |
104 | - | |
105 | -/* | |
106 | - * Miscellaneous configurable options | |
107 | - */ | |
108 | -#define CONFIG_SYS_LONGHELP /* undef to save memory */ | |
109 | -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ | |
110 | -/* Monitor Command Prompt */ | |
111 | -#undef CONFIG_SYS_PROMPT | |
112 | -#ifdef CONFIG_ARCH_VERSATILE_AB | |
113 | -# define CONFIG_SYS_PROMPT "VersatileAB # " | |
114 | -#else | |
115 | -# define CONFIG_SYS_PROMPT "VersatilePB # " | |
116 | -#endif | |
117 | -/* Print Buffer Size */ | |
118 | -#define CONFIG_SYS_PBSIZE \ | |
119 | - (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) | |
120 | -#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ | |
121 | -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ | |
122 | - | |
123 | -#define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */ | |
124 | - | |
125 | -/*----------------------------------------------------------------------- | |
126 | - * Physical Memory Map | |
127 | - */ | |
128 | -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ | |
129 | -#define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */ | |
130 | -#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */ | |
131 | -#define PHYS_FLASH_SIZE 0x04000000 /* 64MB */ | |
132 | - | |
133 | -#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 | |
134 | -#define CONFIG_SYS_INIT_RAM_ADDR 0x00800000 | |
135 | -#define CONFIG_SYS_INIT_RAM_SIZE 0x000FFFFF | |
136 | -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ | |
137 | - GENERATED_GBL_DATA_SIZE) | |
138 | -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ | |
139 | - CONFIG_SYS_GBL_DATA_OFFSET) | |
140 | - | |
141 | -#define CONFIG_BOARD_EARLY_INIT_F | |
142 | - | |
143 | -/*----------------------------------------------------------------------- | |
144 | - * FLASH and environment organization | |
145 | - */ | |
146 | -#ifdef CONFIG_ARCH_VERSATILE_QEMU | |
147 | -#define CONFIG_SYS_TEXT_BASE 0x10000 | |
148 | -#define CONFIG_SYS_NO_FLASH | |
149 | -#define CONFIG_ENV_IS_NOWHERE | |
150 | -#define CONFIG_SYS_MONITOR_LEN 0x80000 | |
151 | -#else | |
152 | -#define CONFIG_SYS_TEXT_BASE 0x01000000 | |
153 | -/* | |
154 | - * Use the CFI flash driver for ease of use | |
155 | - */ | |
156 | -#define CONFIG_SYS_FLASH_CFI | |
157 | -#define CONFIG_FLASH_CFI_DRIVER | |
158 | -#define CONFIG_ENV_IS_IN_FLASH 1 | |
159 | -/* | |
160 | - * System control register | |
161 | - */ | |
162 | -#define VERSATILE_SYS_BASE 0x10000000 | |
163 | -#define VERSATILE_SYS_FLASH_OFFSET 0x4C | |
164 | -#define VERSATILE_FLASHCTRL \ | |
165 | - (VERSATILE_SYS_BASE + VERSATILE_SYS_FLASH_OFFSET) | |
166 | -/* Enable writing to flash */ | |
167 | -#define VERSATILE_FLASHPROG_FLVPPEN (1 << 0) | |
168 | - | |
169 | -/* timeout values are in ticks */ | |
170 | -#define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Erase Timeout */ | |
171 | -#define CONFIG_SYS_FLASH_WRITE_TOUT (2 * CONFIG_SYS_HZ) /* Write Timeout */ | |
172 | - | |
173 | -/* | |
174 | - * Note that CONFIG_SYS_MAX_FLASH_SECT allows for a parameter block | |
175 | - * i.e. | |
176 | - * the bottom "sector" (bottom boot), or top "sector" | |
177 | - * (top boot), is a seperate erase region divided into | |
178 | - * 4 (equal) smaller sectors. This, notionally, allows | |
179 | - * quicker erase/rewrire of the most frequently changed | |
180 | - * area...... | |
181 | - * CONFIG_SYS_MAX_FLASH_SECT is padded up to a multiple of 4 | |
182 | - */ | |
183 | - | |
184 | -#ifdef CONFIG_ARCH_VERSATILE_AB | |
185 | -#define FLASH_SECTOR_SIZE 0x00020000 /* 128 KB sectors */ | |
186 | -#define CONFIG_ENV_SECT_SIZE (2 * FLASH_SECTOR_SIZE) | |
187 | -#define CONFIG_SYS_MAX_FLASH_SECT (520) | |
188 | -#endif | |
189 | - | |
190 | -#ifdef CONFIG_ARCH_VERSATILE_PB /* Versatile PB is default */ | |
191 | -#define FLASH_SECTOR_SIZE 0x00040000 /* 256 KB sectors */ | |
192 | -#define CONFIG_ENV_SECT_SIZE FLASH_SECTOR_SIZE | |
193 | -#define CONFIG_SYS_MAX_FLASH_SECT (260) | |
194 | -#endif | |
195 | - | |
196 | -#define CONFIG_SYS_FLASH_BASE 0x34000000 | |
197 | -#define CONFIG_SYS_MAX_FLASH_BANKS 1 | |
198 | - | |
199 | -#define CONFIG_SYS_MONITOR_LEN (4 * CONFIG_ENV_SECT_SIZE) | |
200 | - | |
201 | -/* The ARM Boot Monitor is shipped in the lowest sector of flash */ | |
202 | - | |
203 | -#define FLASH_TOP (CONFIG_SYS_FLASH_BASE + PHYS_FLASH_SIZE) | |
204 | -#define CONFIG_ENV_ADDR (FLASH_TOP - CONFIG_ENV_SECT_SIZE) | |
205 | -#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE) | |
206 | -#define CONFIG_SYS_MONITOR_BASE (CONFIG_ENV_ADDR - CONFIG_SYS_MONITOR_LEN) | |
207 | - | |
208 | -#define CONFIG_SYS_FLASH_PROTECTION /* The devices have real protection */ | |
209 | -#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ | |
210 | - | |
211 | -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes */ | |
212 | -#endif | |
213 | - | |
214 | -#endif /* __CONFIG_H */ |