sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM i.MX bootsource: convert enums from enum imx_bootsource to uppercase 

Enums are in the same way as defines, so write them in uppercase.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2013-03-14 18:38:40 +01:00 committed by Sascha Hauer
parent 58926bd26f
commit 19e5e04d81
6 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boards/efika-mx-smartbook/board.c
View File

@ -479,7 +479,7 @@ device_initcall(efikamx_devices_init);
static int efikamx_part_init(void) static int efikamx_part_init(void)
{ {
if (imx_bootsource() == bootsource_mmc) { if (imx_bootsource() == BOOTSOURCE_MMC) {
devfs_add_partition("mmc_left", 0x00000, 0x80000, devfs_add_partition("mmc_left", 0x00000, 0x80000,
DEVFS_PARTITION_FIXED, "self0"); DEVFS_PARTITION_FIXED, "self0");
devfs_add_partition("mmc_left", 0x80000, 0x80000, devfs_add_partition("mmc_left", 0x80000, 0x80000,

4
arch/arm/boards/karo-tx53/board.c
View File

@ -235,12 +235,12 @@ static int tx53_part_init(void)
const char *envdev; const char *envdev;
switch (imx_bootsource()) { switch (imx_bootsource()) {
case bootsource_mmc: case BOOTSOURCE_MMC:
devfs_add_partition("disk0", 0x00000, SZ_512K, DEVFS_PARTITION_FIXED, "self0"); devfs_add_partition("disk0", 0x00000, SZ_512K, DEVFS_PARTITION_FIXED, "self0");
devfs_add_partition("disk0", SZ_512K, SZ_1M, DEVFS_PARTITION_FIXED, "env0"); devfs_add_partition("disk0", SZ_512K, SZ_1M, DEVFS_PARTITION_FIXED, "env0");
envdev = "MMC"; envdev = "MMC";
break; break;
case bootsource_nand: case BOOTSOURCE_NAND:
default: default:
devfs_add_partition("nand0", 0x00000, 0x80000, DEVFS_PARTITION_FIXED, "self_raw"); devfs_add_partition("nand0", 0x00000, 0x80000, DEVFS_PARTITION_FIXED, "self_raw");
dev_add_bb_dev("self_raw", "self0"); dev_add_bb_dev("self_raw", "self0");

2
arch/arm/boards/pcm038/pcm038.c
View File

@ -300,7 +300,7 @@ static int pcm038_devices_init(void)
imx27_add_fec(&fec_info); imx27_add_fec(&fec_info);
switch (imx_bootsource()) { switch (imx_bootsource()) {
case bootsource_nand: case BOOTSOURCE_NAND:
devfs_add_partition("nand0", 0x00000, 0x80000, devfs_add_partition("nand0", 0x00000, 0x80000,
DEVFS_PARTITION_FIXED, "self_raw"); DEVFS_PARTITION_FIXED, "self_raw");
dev_add_bb_dev("self_raw", "self0"); dev_add_bb_dev("self_raw", "self0");

4
arch/arm/boards/pcm043/pcm043.c
View File

@ -140,14 +140,14 @@ static int imx35_devices_init(void)
add_cfi_flash_device(DEVICE_ID_DYNAMIC, MX35_CS0_BASE_ADDR, 32 * 1024 * 1024, 0); add_cfi_flash_device(DEVICE_ID_DYNAMIC, MX35_CS0_BASE_ADDR, 32 * 1024 * 1024, 0);
switch (imx_bootsource()) { switch (imx_bootsource()) {
case bootsource_nand: case BOOTSOURCE_NAND:
devfs_add_partition("nand0", 0x00000, SZ_512K, DEVFS_PARTITION_FIXED, "self_raw"); devfs_add_partition("nand0", 0x00000, SZ_512K, DEVFS_PARTITION_FIXED, "self_raw");
dev_add_bb_dev("self_raw", "self0"); dev_add_bb_dev("self_raw", "self0");
devfs_add_partition("nand0", SZ_512K, SZ_256K, DEVFS_PARTITION_FIXED, "env_raw"); devfs_add_partition("nand0", SZ_512K, SZ_256K, DEVFS_PARTITION_FIXED, "env_raw");
dev_add_bb_dev("env_raw", "env0"); dev_add_bb_dev("env_raw", "env0");
envstr = "NAND"; envstr = "NAND";
break; break;
case bootsource_nor: case BOOTSOURCE_NOR:
default: default:
devfs_add_partition("nor0", 0x00000, SZ_512K, DEVFS_PARTITION_FIXED, "self0"); /* ourself */ devfs_add_partition("nor0", 0x00000, SZ_512K, DEVFS_PARTITION_FIXED, "self0"); /* ourself */
devfs_add_partition("nor0", SZ_512K, SZ_128K, DEVFS_PARTITION_FIXED, "env0"); /* environment */ devfs_add_partition("nor0", SZ_512K, SZ_128K, DEVFS_PARTITION_FIXED, "env0"); /* environment */

90
arch/arm/mach-imx/boot.c
View File

@ -20,15 +20,15 @@
#include <mach/generic.h> #include <mach/generic.h>
static const char *bootsource_str[] = { static const char *bootsource_str[] = {
[bootsource_unknown] = "unknown", [BOOTSOURCE_UNKNOWN] = "unknown",
[bootsource_nand] = "nand", [BOOTSOURCE_NAND] = "nand",
[bootsource_nor] = "nor", [BOOTSOURCE_NOR] = "nor",
[bootsource_mmc] = "mmc", [BOOTSOURCE_MMC] = "mmc",
[bootsource_i2c] = "i2c", [BOOTSOURCE_I2C] = "i2c",
[bootsource_spi] = "spi", [BOOTSOURCE_SPI] = "spi",
[bootsource_serial] = "serial", [BOOTSOURCE_SERIAL] = "serial",
[bootsource_onenand] = "onenand", [BOOTSOURCE_ONENAND] = "onenand",
[bootsource_hd] = "harddisk", [BOOTSOURCE_HD] = "harddisk",
}; };
static enum imx_bootsource bootsource; static enum imx_bootsource bootsource;
@ -36,7 +36,7 @@ static enum imx_bootsource bootsource;
void imx_set_bootsource(enum imx_bootsource src) void imx_set_bootsource(enum imx_bootsource src)
{ {
if (src >= ARRAY_SIZE(bootsource_str)) if (src >= ARRAY_SIZE(bootsource_str))
src = bootsource_unknown; src = BOOTSOURCE_UNKNOWN;
bootsource = src; bootsource = src;
@ -54,25 +54,25 @@ BAREBOX_MAGICVAR(barebox_loc, "The source barebox has been booted from");
/* [CTRL][TYPE] */ /* [CTRL][TYPE] */
static const enum imx_bootsource locations[4][4] = { static const enum imx_bootsource locations[4][4] = {
{ /* CTRL = WEIM */ { /* CTRL = WEIM */
bootsource_nor, BOOTSOURCE_NOR,
bootsource_unknown, BOOTSOURCE_UNKNOWN,
bootsource_onenand, BOOTSOURCE_ONENAND,
bootsource_unknown, BOOTSOURCE_UNKNOWN,
}, { /* CTRL == NAND */ }, { /* CTRL == NAND */
bootsource_nand, BOOTSOURCE_NAND,
bootsource_nand, BOOTSOURCE_NAND,
bootsource_nand, BOOTSOURCE_NAND,
bootsource_nand, BOOTSOURCE_NAND,
}, { /* CTRL == ATA, (imx35 only) */ }, { /* CTRL == ATA, (imx35 only) */
bootsource_unknown, BOOTSOURCE_UNKNOWN,
bootsource_unknown, /* might be p-ata */ BOOTSOURCE_UNKNOWN, /* might be p-ata */
bootsource_unknown, BOOTSOURCE_UNKNOWN,
bootsource_unknown, BOOTSOURCE_UNKNOWN,
}, { /* CTRL == expansion */ }, { /* CTRL == expansion */
bootsource_mmc, /* note imx25 could also be: movinand, ce-ata */ BOOTSOURCE_MMC, /* note imx25 could also be: movinand, ce-ata */
bootsource_unknown, BOOTSOURCE_UNKNOWN,
bootsource_i2c, BOOTSOURCE_I2C,
bootsource_spi, BOOTSOURCE_SPI,
} }
}; };
@ -132,16 +132,16 @@ void imx_27_boot_save_loc(void __iomem *sysctrl_base)
switch (val) { switch (val) {
case IMX27_GPCR_BOOT_UART_USB: case IMX27_GPCR_BOOT_UART_USB:
src = bootsource_serial; src = BOOTSOURCE_SERIAL;
break; break;
case IMX27_GPCR_BOOT_8BIT_NAND_2k: case IMX27_GPCR_BOOT_8BIT_NAND_2k:
case IMX27_GPCR_BOOT_16BIT_NAND_2k: case IMX27_GPCR_BOOT_16BIT_NAND_2k:
case IMX27_GPCR_BOOT_16BIT_NAND_512: case IMX27_GPCR_BOOT_16BIT_NAND_512:
case IMX27_GPCR_BOOT_8BIT_NAND_512: case IMX27_GPCR_BOOT_8BIT_NAND_512:
src = bootsource_nand; src = BOOTSOURCE_NAND;
break; break;
default: default:
src = bootsource_nor; src = BOOTSOURCE_NOR;
break; break;
} }
@ -155,7 +155,7 @@ void imx_27_boot_save_loc(void __iomem *sysctrl_base)
int imx51_boot_save_loc(void __iomem *src_base) int imx51_boot_save_loc(void __iomem *src_base)
{ {
enum imx_bootsource src = bootsource_unknown; enum imx_bootsource src = BOOTSOURCE_UNKNOWN;
uint32_t reg; uint32_t reg;
unsigned int ctrl, type; unsigned int ctrl, type;
@ -172,10 +172,10 @@ int imx51_boot_save_loc(void __iomem *src_base)
break; break;
case 1: case 1:
/* reserved */ /* reserved */
src = bootsource_unknown; src = BOOTSOURCE_UNKNOWN;
break; break;
case 3: case 3:
src = bootsource_serial; src = BOOTSOURCE_SERIAL;
break; break;
} }
@ -188,31 +188,31 @@ int imx51_boot_save_loc(void __iomem *src_base)
#define IMX53_SRC_SBMR 0x4 #define IMX53_SRC_SBMR 0x4
int imx53_boot_save_loc(void __iomem *src_base) int imx53_boot_save_loc(void __iomem *src_base)
{ {
enum imx_bootsource src = bootsource_unknown; enum imx_bootsource src = BOOTSOURCE_UNKNOWN;
uint32_t cfg1 = readl(src_base + IMX53_SRC_SBMR) & 0xff; uint32_t cfg1 = readl(src_base + IMX53_SRC_SBMR) & 0xff;
switch (cfg1 >> 4) { switch (cfg1 >> 4) {
case 2: case 2:
src = bootsource_hd; src = BOOTSOURCE_HD;
break; break;
case 3: case 3:
if (cfg1 & (1 << 3)) if (cfg1 & (1 << 3))
src = bootsource_spi; src = BOOTSOURCE_SPI;
else else
src = bootsource_i2c; src = BOOTSOURCE_I2C;
break; break;
case 4: case 4:
case 5: case 5:
case 6: case 6:
case 7: case 7:
src = bootsource_mmc; src = BOOTSOURCE_MMC;
break; break;
default: default:
break; break;
} }
if (cfg1 & (1 << 7)) if (cfg1 & (1 << 7))
src = bootsource_nand; src = BOOTSOURCE_NAND;
imx_set_bootsource(src); imx_set_bootsource(src);
@ -224,7 +224,7 @@ int imx53_boot_save_loc(void __iomem *src_base)
int imx6_boot_save_loc(void __iomem *src_base) int imx6_boot_save_loc(void __iomem *src_base)
{ {
enum imx_bootsource src = bootsource_unknown; enum imx_bootsource src = BOOTSOURCE_UNKNOWN;
uint32_t sbmr2 = readl(src_base + IMX6_SRC_SBMR2) >> 24; uint32_t sbmr2 = readl(src_base + IMX6_SRC_SBMR2) >> 24;
uint32_t cfg1 = readl(src_base + IMX6_SRC_SBMR1) & 0xff; uint32_t cfg1 = readl(src_base + IMX6_SRC_SBMR1) & 0xff;
uint32_t boot_cfg_4_2_0; uint32_t boot_cfg_4_2_0;
@ -237,7 +237,7 @@ int imx6_boot_save_loc(void __iomem *src_base)
case 2: /* internal boot */ case 2: /* internal boot */
goto internal_boot; goto internal_boot;
case 1: /* Serial Downloader */ case 1: /* Serial Downloader */
src = bootsource_serial; src = BOOTSOURCE_SERIAL;
break; break;
case 3: /* reserved */ case 3: /* reserved */
break; break;
@ -251,28 +251,28 @@ internal_boot:
switch (cfg1 >> 4) { switch (cfg1 >> 4) {
case 2: case 2:
src = bootsource_hd; src = BOOTSOURCE_HD;
break; break;
case 3: case 3:
boot_cfg_4_2_0 = (cfg1 >> 16) & 0x7; boot_cfg_4_2_0 = (cfg1 >> 16) & 0x7;
if (boot_cfg_4_2_0 > 4) if (boot_cfg_4_2_0 > 4)
src = bootsource_i2c; src = BOOTSOURCE_I2C;
else else
src = bootsource_spi; src = BOOTSOURCE_SPI;
break; break;
case 4: case 4:
case 5: case 5:
case 6: case 6:
case 7: case 7:
src = bootsource_mmc; src = BOOTSOURCE_MMC;
break; break;
default: default:
break; break;
} }
if (cfg1 & (1 << 7)) if (cfg1 & (1 << 7))
src = bootsource_nand; src = BOOTSOURCE_NAND;
imx_set_bootsource(src); imx_set_bootsource(src);

18
arch/arm/mach-imx/include/mach/generic.h
View File

@ -2,15 +2,15 @@
u64 imx_uid(void); u64 imx_uid(void);
enum imx_bootsource { enum imx_bootsource {
bootsource_unknown, BOOTSOURCE_UNKNOWN,
bootsource_nand, BOOTSOURCE_NAND,
bootsource_nor, BOOTSOURCE_NOR,
bootsource_mmc, BOOTSOURCE_MMC,
bootsource_i2c, BOOTSOURCE_I2C,
bootsource_spi, BOOTSOURCE_SPI,
bootsource_serial, BOOTSOURCE_SERIAL,
bootsource_onenand, BOOTSOURCE_ONENAND,
bootsource_hd, BOOTSOURCE_HD,
}; };
enum imx_bootsource imx_bootsource(void); enum imx_bootsource imx_bootsource(void);