Skip to content
Snippets Groups Projects
Commit 23a004a6 authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Tom Rini
Browse files

sniper: Various minor cleanups, missing Kconfig configs and reorganisation


This introduces some minor cleanups, regarding aspects such as board name, code
and headers organization as well as deprecated and missing config options.

Signed-off-by: default avatarPaul Kocialkowski <contact@paulk.fr>
Reviewed-by: default avatarTom Rini <trini@konsulko.com>
parent ba10b852
No related branches found
No related tags found
No related merge requests found
...@@ -110,7 +110,7 @@ config TARGET_OMAP3_CAIRO ...@@ -110,7 +110,7 @@ config TARGET_OMAP3_CAIRO
select DM_GPIO select DM_GPIO
config TARGET_SNIPER config TARGET_SNIPER
bool "Sniper" bool "LG Optimus Black"
select SUPPORT_SPL select SUPPORT_SPL
select DM select DM
select DM_SERIAL select DM_SERIAL
......
...@@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR; ...@@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR;
const omap3_sysinfo sysinfo = { const omap3_sysinfo sysinfo = {
.mtype = DDR_STACKED, .mtype = DDR_STACKED,
.board_string = "Sniper", .board_string = "sniper",
.nand_string = "MMC" .nand_string = "MMC"
}; };
...@@ -58,6 +58,11 @@ static struct musb_hdrc_platform_data musb_platform_data = { ...@@ -58,6 +58,11 @@ static struct musb_hdrc_platform_data musb_platform_data = {
.board_data = &musb_board_data, .board_data = &musb_board_data,
}; };
void set_muxconf_regs(void)
{
MUX_SNIPER();
}
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
void get_board_mem_timings(struct board_sdrc_timings *timings) void get_board_mem_timings(struct board_sdrc_timings *timings)
{ {
...@@ -69,12 +74,6 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) ...@@ -69,12 +74,6 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
} }
#endif #endif
u32 get_board_rev(void)
{
/* Sold devices are expected to be at least revision F. */
return 6;
}
int board_init(void) int board_init(void)
{ {
/* GPMC init */ /* GPMC init */
...@@ -147,6 +146,12 @@ int misc_init_r(void) ...@@ -147,6 +146,12 @@ int misc_init_r(void)
return 0; return 0;
} }
u32 get_board_rev(void)
{
/* Sold devices are expected to be at least revision F. */
return 6;
}
void get_board_serial(struct tag_serialnr *serialnr) void get_board_serial(struct tag_serialnr *serialnr)
{ {
omap_die_id_get_board_serial(serialnr); omap_die_id_get_board_serial(serialnr);
...@@ -162,11 +167,6 @@ int fb_set_reboot_flag(void) ...@@ -162,11 +167,6 @@ int fb_set_reboot_flag(void)
return omap_reboot_mode_store('b'); return omap_reboot_mode_store('b');
} }
void set_muxconf_regs(void)
{
MUX_SNIPER();
}
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
......
This diff is collapsed.
...@@ -2,10 +2,13 @@ CONFIG_ARM=y ...@@ -2,10 +2,13 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y CONFIG_OMAP34XX=y
CONFIG_TARGET_SNIPER=y CONFIG_TARGET_SNIPER=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_PROMPT="Sniper # " CONFIG_SYS_PROMPT="sniper # "
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_GADGET=y
...@@ -61,11 +61,8 @@ ...@@ -61,11 +61,8 @@
*/ */
#define CONFIG_SYS_TEXT_BASE 0x80100000 #define CONFIG_SYS_TEXT_BASE 0x80100000
#define CONFIG_SYS_SDRAM_BASE OMAP34XX_SDRC_CS0 #define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020F800 #define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \
#define CONFIG_SYS_INIT_RAM_SIZE 0x800
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
CONFIG_SYS_INIT_RAM_SIZE - \
GENERATED_GBL_DATA_SIZE) GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_MALLOC_LEN (1024 * 1024 + CONFIG_ENV_SIZE) #define CONFIG_SYS_MALLOC_LEN (1024 * 1024 + CONFIG_ENV_SIZE)
...@@ -103,8 +100,8 @@ ...@@ -103,8 +100,8 @@
* MMC * MMC
*/ */
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_OMAP_HSMMC #define CONFIG_OMAP_HSMMC
#define CONFIG_CMD_MMC #define CONFIG_CMD_MMC
...@@ -183,7 +180,6 @@ ...@@ -183,7 +180,6 @@
* Serial * Serial
*/ */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_REG_SIZE (-4)
...@@ -192,7 +188,6 @@ ...@@ -192,7 +188,6 @@
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
#define CONFIG_CONS_INDEX 3 #define CONFIG_CONS_INDEX 3
#define CONFIG_SERIAL3 3
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \ #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment