BPI/sunxi-tools
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bare-metal: Use anonymous structs in soc_info and expand table

Browse Source 
This gives better readability to the table.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
This commit is contained in:
Paul Kocialkowski 2025-04-16 12:22:49 +02:00 committed by Andre Przywara
parent b5e2eb2bbc
commit c90ae72147
3 changed files with 254 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

299
bare-metal.c
View File

@ -53,64 +53,231 @@
#include "bare-metal.h" #include "bare-metal.h"
static const struct soc_info soc_table[] = { static const struct soc_info soc_table[] = {
{ 0x1623, "A10", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, {
SUNXI_UART0_BASE, SUNXI_GPB(22), MUX_2 }, .id = 0x1623,
{ 0x1625, "A10s", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, .name = "A10",
SUNXI_UART0_BASE, SUNXI_GPB(19), MUX_2, FLAG_VAR0 }, .pio = { SUNXI_PIO_BASE },
{ 0x1625, "A13", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, .ccu = { AW_CCM_BASE },
SUNXI_UART0_BASE, SUNXI_GPB(19), MUX_2, FLAG_VAR1 | FLAG_UART_ON_PORTF }, .sram = { SRAM_A1_ADDR_0 },
{ 0x1633, "A31/A31s", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, .uart0 = { SUNXI_UART0_BASE, SUNXI_GPB(22), MUX_2 },
SUNXI_UART0_BASE, SUNXI_GPH(20), MUX_2, }, },
{ 0x1639, "A80", A80_PIO_BASE, A80_CCM_BASE, SRAM_A1_ADDR_10000, {
A80_UART0_BASE, SUNXI_GPH(12), MUX_2, FLAG_A80_CLOCK }, .id = 0x1625,
{ 0x1651, "A20", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, .name = "A10s",
SUNXI_UART0_BASE, SUNXI_GPB(22), MUX_2 }, .flags = FLAG_VAR0,
{ 0x1663, "F1C100s", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, .pio = { SUNXI_PIO_BASE },
SUNIV_UART0_BASE, SUNXI_GPE(0), MUX_5, FLAG_UART_ON_APB1 }, .ccu = { AW_CCM_BASE },
{ 0x1673, "A83T", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, .sram = { SRAM_A1_ADDR_0 },
SUNXI_UART0_BASE, SUNXI_GPB(9), MUX_2 }, .uart0 = { SUNXI_UART0_BASE, SUNXI_GPB(19), MUX_2 },
{ 0x1689, "A64", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_10000, },
SUNXI_UART0_BASE, SUNXI_GPB(8), MUX_4 }, {
{ 0x1680, "H2+", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, .id = 0x1625,
SUNXI_UART0_BASE, SUNXI_GPA(4), MUX_2, FLAG_VAR1 }, .name = "A13",
{ 0x1680, "H3", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, .flags = FLAG_VAR1 | FLAG_UART_ON_PORTF,
SUNXI_UART0_BASE, SUNXI_GPA(4), MUX_2, FLAG_VAR0 }, .pio = { SUNXI_PIO_BASE },
{ 0x1681, "V3s", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, .ccu = { AW_CCM_BASE },
SUNXI_UART0_BASE, SUNXI_GPB(8), MUX_3 }, .sram = { SRAM_A1_ADDR_0 },
{ 0x1701, "R40", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_0, .uart0 = { SUNXI_UART0_BASE, SUNXI_GPB(19), MUX_2 },
SUNXI_UART0_BASE, SUNXI_GPB(22), MUX_2 }, },
{ 0x1708, "T7", H6_PIO_BASE, H6_CCM_BASE, SRAM_A1_ADDR_20000, {
H6_UART0_BASE, SUNXI_GPB(8), MUX_4, FLAG_NEW_CLOCK }, .id = 0x1633,
{ 0x1718, "H5", SUNXI_PIO_BASE, AW_CCM_BASE, SRAM_A1_ADDR_10000, .name = "A31/A31s",
SUNXI_UART0_BASE, SUNXI_GPA(4), MUX_2 }, .pio = { SUNXI_PIO_BASE },
{ 0x1719, "A63", H6_PIO_BASE, H6_CCM_BASE, SRAM_A1_ADDR_10000, .ccu = { AW_CCM_BASE },
H6_UART0_BASE, SUNXI_GPB(9), MUX_4, FLAG_NEW_CLOCK }, .sram = { SRAM_A1_ADDR_0 },
{ 0x1721, "V5", H6_PIO_BASE, H6_CCM_BASE, SRAM_A1_ADDR_20000, .uart0 = { SUNXI_UART0_BASE, SUNXI_GPH(20), MUX_2 },
H6_UART0_BASE, SUNXI_GPB(9), MUX_2, FLAG_NEW_CLOCK }, },
{ 0x1728, "H6", H6_PIO_BASE, H6_CCM_BASE, SRAM_A1_ADDR_20000, {
H6_UART0_BASE, SUNXI_GPH(0), MUX_2, FLAG_NEW_CLOCK }, .id = 0x1639,
{ 0x1817, "V831", H6_PIO_BASE, H6_CCM_BASE, SRAM_A1_ADDR_20000, .name = "A80",
H6_UART0_BASE, SUNXI_GPH(9), MUX_5, FLAG_NEW_CLOCK }, .flags = FLAG_A80_CLOCK,
{ 0x1823, "H616", H6_PIO_BASE, H6_CCM_BASE, SRAM_A1_ADDR_20000, .pio = { A80_PIO_BASE },
H6_UART0_BASE, SUNXI_GPH(0), MUX_2, FLAG_NEW_CLOCK }, .ccu = { A80_CCM_BASE },
{ 0x1851, "R329", R329_PIO_BASE, R329_CCM_BASE, SRAM_A1_ADDR_100000, .sram = { SRAM_A1_ADDR_10000 },
R329_UART0_BASE, SUNXI_GPB(4), MUX_2, FLAG_NCAT2 }, .uart0 = { A80_UART0_BASE, SUNXI_GPH(12), MUX_2 },
{ 0x1855, "A133", H6_PIO_BASE, H6_CCM_BASE, SRAM_A1_ADDR_20000, },
H6_UART0_BASE, SUNXI_GPB(9), MUX_2, FLAG_NEW_CLOCK }, {
{ 0x1859, "R528", V853_PIO_BASE, R329_CCM_BASE, SRAM_A1_ADDR_20000, .id = 0x1651,
R329_UART0_BASE, SUNXI_GPE(2), MUX_6, FLAG_NCAT2 }, .name = "A20",
{ 0x1886, "V853", V853_PIO_BASE, R329_CCM_BASE, SRAM_A1_ADDR_20000, .pio = { SUNXI_PIO_BASE },
R329_UART0_BASE, SUNXI_GPH(9), MUX_5, FLAG_NCAT2 }, .ccu = { AW_CCM_BASE },
{ 0x1890, "A523", V853_PIO_BASE, R329_CCM_BASE, SRAM_A1_ADDR_20000, .sram = { SRAM_A1_ADDR_0 },
R329_UART0_BASE, SUNXI_GPB(9), MUX_2, FLAG_NCAT2 }, .uart0 = { SUNXI_UART0_BASE, SUNXI_GPB(22), MUX_2 },
},
{
.id = 0x1663,
.name = "F1C100s",
.flags = FLAG_UART_ON_APB1,
.pio = { SUNXI_PIO_BASE },
.ccu = { AW_CCM_BASE },
.sram = { SRAM_A1_ADDR_0 },
.uart0 = { SUNIV_UART0_BASE, SUNXI_GPE(0), MUX_5 },
},
{
.id = 0x1673,
.name = "A83T",
.pio = { SUNXI_PIO_BASE },
.ccu = { AW_CCM_BASE },
.sram = { SRAM_A1_ADDR_0 },
.uart0 = { SUNXI_UART0_BASE, SUNXI_GPB(9), MUX_2 },
},
{
.id = 0x1689,
.name = "A64",
.pio = { SUNXI_PIO_BASE },
.ccu = { AW_CCM_BASE },
.sram = { SRAM_A1_ADDR_10000 },
.uart0 = { SUNXI_UART0_BASE, SUNXI_GPB(8), MUX_4 },
},
{
.id = 0x1680,
.name = "H2+",
.flags = FLAG_VAR1,
.pio = { SUNXI_PIO_BASE },
.ccu = { AW_CCM_BASE },
.sram = { SRAM_A1_ADDR_0 },
.uart0 = { SUNXI_UART0_BASE, SUNXI_GPA(4), MUX_2 },
},
{
.id = 0x1680,
.name = "H3",
.flags = FLAG_VAR0,
.pio = { SUNXI_PIO_BASE },
.ccu = { AW_CCM_BASE },
.sram = { SRAM_A1_ADDR_0 },
.uart0 = { SUNXI_UART0_BASE, SUNXI_GPA(4), MUX_2 },
},
{
.id = 0x1681,
.name = "V3s",
.pio = { SUNXI_PIO_BASE },
.ccu = { AW_CCM_BASE },
.sram = { SRAM_A1_ADDR_0 },
.uart0 = { SUNXI_UART0_BASE, SUNXI_GPB(8), MUX_3 },
},
{
.id = 0x1701,
.name = "R40",
.pio = { SUNXI_PIO_BASE },
.ccu = { AW_CCM_BASE },
.sram = { SRAM_A1_ADDR_0 },
.uart0 = { SUNXI_UART0_BASE, SUNXI_GPB(22), MUX_2 },
},
{
.id = 0x1708,
.name = "T7",
.flags = FLAG_NEW_CLOCK,
.pio = { H6_PIO_BASE },
.ccu = { H6_CCM_BASE },
.sram = { SRAM_A1_ADDR_20000 },
.uart0 = { H6_UART0_BASE, SUNXI_GPB(8), MUX_4 },
},
{
.id = 0x1718,
.name = "H5",
.pio = { SUNXI_PIO_BASE },
.ccu = { AW_CCM_BASE },
.sram = { SRAM_A1_ADDR_10000 },
.uart0 = { SUNXI_UART0_BASE, SUNXI_GPA(4), MUX_2 },
},
{
.id = 0x1719,
.name = "A63",
.flags = FLAG_NEW_CLOCK,
.pio = { H6_PIO_BASE },
.ccu = { H6_CCM_BASE },
.sram = { SRAM_A1_ADDR_10000 },
.uart0 = { H6_UART0_BASE, SUNXI_GPB(9), MUX_4 },
},
{
.id = 0x1721,
.name = "V5",
.flags = FLAG_NEW_CLOCK,
.pio = { H6_PIO_BASE },
.ccu = { H6_CCM_BASE },
.sram = { SRAM_A1_ADDR_20000 },
.uart0 = { H6_UART0_BASE, SUNXI_GPB(9), MUX_2 },
},
{
.id = 0x1728,
.name = "H6",
.flags = FLAG_NEW_CLOCK,
.pio = { H6_PIO_BASE },
.ccu = { H6_CCM_BASE },
.sram = { SRAM_A1_ADDR_20000 },
.uart0 = { H6_UART0_BASE, SUNXI_GPH(0), MUX_2 },
},
{
.id = 0x1817,
.name = "V831",
.flags = FLAG_NEW_CLOCK,
.pio = { H6_PIO_BASE },
.ccu = { H6_CCM_BASE },
.sram = { SRAM_A1_ADDR_20000 },
.uart0 = { H6_UART0_BASE, SUNXI_GPH(9), MUX_5 },
},
{
.id = 0x1823,
.name = "H616",
.flags = FLAG_NEW_CLOCK,
.pio = { H6_PIO_BASE },
.ccu = { H6_CCM_BASE },
.sram = { SRAM_A1_ADDR_20000 },
.uart0 = { H6_UART0_BASE, SUNXI_GPH(0), MUX_2 },
},
{
.id = 0x1851,
.name = "R329",
.flags = FLAG_NCAT2,
.pio = { R329_PIO_BASE },
.ccu = { R329_CCM_BASE },
.sram = { SRAM_A1_ADDR_100000 },
.uart0 = { R329_UART0_BASE, SUNXI_GPB(4), MUX_2 },
},
{
.id = 0x1855,
.name = "A133",
.flags = FLAG_NEW_CLOCK,
.pio = { H6_PIO_BASE },
.ccu = { H6_CCM_BASE },
.sram = { SRAM_A1_ADDR_20000 },
.uart0 = { H6_UART0_BASE, SUNXI_GPB(9), MUX_2 },
},
{
.id = 0x1859,
.name = "R528",
.flags = FLAG_NCAT2,
.pio = { V853_PIO_BASE },
.ccu = { R329_CCM_BASE },
.sram = { SRAM_A1_ADDR_20000 },
.uart0 = { R329_UART0_BASE, SUNXI_GPE(2), MUX_6 },
},
{
.id = 0x1886,
.name = "V853",
.flags = FLAG_NCAT2,
.pio = { V853_PIO_BASE },
.ccu = { R329_CCM_BASE },
.sram = { SRAM_A1_ADDR_20000 },
.uart0 = { R329_UART0_BASE, SUNXI_GPH(9), MUX_5 },
},
{
.id = 0x1890,
.name = "A523",
.flags = FLAG_NCAT2,
.pio = { V853_PIO_BASE },
.ccu = { R329_CCM_BASE },
.sram = { SRAM_A1_ADDR_20000 },
.uart0 = { R329_UART0_BASE, SUNXI_GPB(9), MUX_2 },
},
}; };
static const struct soc_info *find_soc_info(int soc_id, int variant) static const struct soc_info *find_soc_info(int id, int variant)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(soc_table); i++) { for (i = 0; i < ARRAY_SIZE(soc_table); i++) {
if (soc_table[i].soc_id != soc_id) if (soc_table[i].id != id)
continue; continue;
if (variant == (soc_table[i].flags & FLAG_VAR1)) if (variant == (soc_table[i].flags & FLAG_VAR1))
@ -271,7 +438,7 @@ const struct soc_info *sunxi_detect_soc(void)
static void clock_init_uart(const struct soc_info *soc) static void clock_init_uart(const struct soc_info *soc)
{ {
if (soc->flags & FLAG_NEW_CLOCK) { if (soc->flags & FLAG_NEW_CLOCK) {
set_wbit(soc->ccu_base + 0x90c, set_wbit(soc->ccu.base + 0x90c,
0x10001 << (CONFIG_CONS_INDEX - 1)); 0x10001 << (CONFIG_CONS_INDEX - 1));
} else { } else {
int bit = 16 + CONFIG_CONS_INDEX - 1; int bit = 16 + CONFIG_CONS_INDEX - 1;
@ -287,9 +454,9 @@ static void clock_init_uart(const struct soc_info *soc)
reset_ofs = 0x5b4; reset_ofs = 0x5b4;
} }
/* Open the clock gate for UART0 */ /* Open the clock gate for UART0 */
set_wbit(soc->ccu_base + gate_ofs, 1U << bit); set_wbit(soc->ccu.base + gate_ofs, 1U << bit);
/* Deassert UART0 reset (not really needed on old SoCs) */ /* Deassert UART0 reset (not really needed on old SoCs) */
set_wbit(soc->ccu_base + reset_ofs, 1U << bit); set_wbit(soc->ccu.base + reset_ofs, 1U << bit);
} }
} }
@ -301,7 +468,7 @@ static void clock_init_uart(const struct soc_info *soc)
void gpio_init(const struct soc_info *soc) void gpio_init(const struct soc_info *soc)
{ {
pio_base = soc->pio_base; pio_base = soc->pio.base;
if (soc->flags & FLAG_NEW_GPIO) { if (soc->flags & FLAG_NEW_GPIO) {
/* GPIO V2 */ /* GPIO V2 */
@ -317,17 +484,17 @@ void gpio_init(const struct soc_info *soc)
if (soc->flags & FLAG_UART_ON_PORTF) { if (soc->flags & FLAG_UART_ON_PORTF) {
/* Disable normal UART0 pins to avoid conflict */ /* Disable normal UART0 pins to avoid conflict */
sunxi_gpio_set_cfgpin(soc->uart0_tx_pin, MUX_GPIO_INPUT); sunxi_gpio_set_cfgpin(soc->uart0.pin_tx, MUX_GPIO_INPUT);
sunxi_gpio_set_cfgpin(soc->uart0_tx_pin + 1, MUX_GPIO_INPUT); sunxi_gpio_set_cfgpin(soc->uart0.pin_tx + 1, MUX_GPIO_INPUT);
/* Use SD breakout board to access UART0 on MMC0 pins */ /* Use SD breakout board to access UART0 on MMC0 pins */
sunxi_gpio_set_cfgpin(SUNXI_GPF(2), soc->uart0_pinmux); sunxi_gpio_set_cfgpin(SUNXI_GPF(2), soc->uart0.pinmux);
sunxi_gpio_set_cfgpin(SUNXI_GPF(4), soc->uart0_pinmux); sunxi_gpio_set_cfgpin(SUNXI_GPF(4), soc->uart0.pinmux);
sunxi_gpio_set_pull(SUNXI_GPF(4), SUNXI_GPIO_PULL_UP); sunxi_gpio_set_pull(SUNXI_GPF(4), SUNXI_GPIO_PULL_UP);
} else { } else {
sunxi_gpio_set_cfgpin(soc->uart0_tx_pin, soc->uart0_pinmux); sunxi_gpio_set_cfgpin(soc->uart0.pin_tx, soc->uart0.pinmux);
sunxi_gpio_set_cfgpin(soc->uart0_tx_pin + 1, soc->uart0_pinmux); sunxi_gpio_set_cfgpin(soc->uart0.pin_tx + 1, soc->uart0.pinmux);
sunxi_gpio_set_pull(soc->uart0_tx_pin + 1, SUNXI_GPIO_PULL_UP); sunxi_gpio_set_pull(soc->uart0.pin_tx + 1, SUNXI_GPIO_PULL_UP);
} }
} }
@ -361,13 +528,13 @@ void uart0_init(const struct soc_info *soc)
{ {
clock_init_uart(soc); clock_init_uart(soc);
uart0_base = soc->uart0_base; uart0_base = soc->uart0.base;
/* select dll dlh */ /* select dll dlh */
writel(0x80, UART0_LCR); writel(0x80, UART0_LCR);
/* set baudrate */ /* set baudrate */
writel(0, UART0_DLH); writel(0, UART0_DLH);
if (soc->soc_id == 0x1663) if (soc->id == 0x1663)
writel(BAUD_115200_SUNIV, UART0_DLL); writel(BAUD_115200_SUNIV, UART0_DLL);
else else
writel(BAUD_115200, UART0_DLL); writel(BAUD_115200, UART0_DLL);
@ -392,7 +559,7 @@ void uart0_puts(const char *s)
int get_boot_device(const struct soc_info *soc) int get_boot_device(const struct soc_info *soc)
{ {
u32 *spl_signature = (void *)soc->sram_a1_base + 0x4; u32 *spl_signature = (void *)soc->sram.a1_base + 0x4;
/* Check the eGON.BT0 magic in the SPL header */ /* Check the eGON.BT0 magic in the SPL header */
if (spl_signature[0] != 0x4E4F4765 || spl_signature[1] != 0x3054422E) if (spl_signature[0] != 0x4E4F4765 || spl_signature[1] != 0x3054422E)

28
bare-metal.h
View File

@ -186,15 +186,27 @@ enum sunxi_gpio_number {
enum { BOOT_DEVICE_UNK, BOOT_DEVICE_FEL, BOOT_DEVICE_MMC0, BOOT_DEVICE_SPI }; enum { BOOT_DEVICE_UNK, BOOT_DEVICE_FEL, BOOT_DEVICE_MMC0, BOOT_DEVICE_SPI };
struct soc_info { struct soc_info {
u16 soc_id; u16 id;
char soc_name[10]; char name[10];
u32 pio_base;
u32 ccu_base;
u32 sram_a1_base;
u32 uart0_base;
u16 uart0_tx_pin;
u8 uart0_pinmux;
u8 flags; u8 flags;
const struct {
u32 base;
} pio;
const struct {
u32 base;
} ccu;
const struct {
u32 a1_base;
} sram;
const struct {
u32 base;
u16 pin_tx;
u8 pinmux;
} uart0;
}; };
const struct soc_info *sunxi_detect_soc(void); const struct soc_info *sunxi_detect_soc(void);

2
uart0-helloworld-sdboot.c
View File

@ -63,7 +63,7 @@ int main(void)
uart0_init(soc); uart0_init(soc);
uart0_puts("\nHello from Allwinner "); uart0_puts("\nHello from Allwinner ");
uart0_puts(soc->soc_name); uart0_puts(soc->name);
uart0_puts("!\n"); uart0_puts("!\n");
switch (get_boot_device(soc)) { switch (get_boot_device(soc)) {