Compare commits
12 Commits
cherry-69e
...
cherry-822
| Author | SHA1 | Date | |
|---|---|---|---|
|
33e347441f | ||
|
f3a162b9cb | ||
|
093b6347fc | ||
|
|
224ad398f1 | ||
|
4b5add56c8 | ||
|
0df0d12e13 | ||
|
f65803d57d | ||
|
|
c8e20dd902 | ||
|
|
116258a4b7 | ||
|
|
49acdb6f38 | ||
|
|
b97cf49f4a | ||
|
|
09522354aa |
@@ -203,3 +203,7 @@
|
||||
&sysclk {
|
||||
bootph-all;
|
||||
};
|
||||
|
||||
&usb0 {
|
||||
dr_mode = "host";
|
||||
};
|
||||
|
||||
@@ -210,8 +210,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
|
||||
fdt_set_phy_handle(fdt, compat, addr,
|
||||
"phy_1gkx1");
|
||||
fdt_status_okay_by_alias(fdt, "1gkx_pcs_mdio1");
|
||||
sprintf(buf, "%s%s%s", buf, "lane-c,",
|
||||
(char *)lane_mode[0]);
|
||||
strcat(buf, "lane-c,");
|
||||
strcat(buf, (char *)lane_mode[0]);
|
||||
out_be32(&srds_regs->srdspccr1, srds1_pccr1 |
|
||||
PCCR1_SGMIIH_KX_MASK);
|
||||
break;
|
||||
@@ -222,8 +222,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
|
||||
fdt_set_phy_handle(fdt, compat, addr,
|
||||
"phy_1gkx2");
|
||||
fdt_status_okay_by_alias(fdt, "1gkx_pcs_mdio2");
|
||||
sprintf(buf, "%s%s%s", buf, "lane-d,",
|
||||
(char *)lane_mode[0]);
|
||||
strcat(buf, "lane-d,");
|
||||
strcat(buf, (char *)lane_mode[0]);
|
||||
out_be32(&srds_regs->srdspccr1, srds1_pccr1 |
|
||||
PCCR1_SGMIIG_KX_MASK);
|
||||
break;
|
||||
@@ -234,8 +234,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
|
||||
fdt_set_phy_handle(fdt, compat, addr,
|
||||
"phy_1gkx9");
|
||||
fdt_status_okay_by_alias(fdt, "1gkx_pcs_mdio9");
|
||||
sprintf(buf, "%s%s%s", buf, "lane-a,",
|
||||
(char *)lane_mode[0]);
|
||||
strcat(buf, "lane-a,");
|
||||
strcat(buf, (char *)lane_mode[0]);
|
||||
out_be32(&srds_regs->srdspccr1, srds1_pccr1 |
|
||||
PCCR1_SGMIIE_KX_MASK);
|
||||
break;
|
||||
@@ -247,8 +247,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
|
||||
"phy_1gkx10");
|
||||
fdt_status_okay_by_alias(fdt,
|
||||
"1gkx_pcs_mdio10");
|
||||
sprintf(buf, "%s%s%s", buf, "lane-b,",
|
||||
(char *)lane_mode[0]);
|
||||
strcat(buf, "lane-b,");
|
||||
strcat(buf, (char *)lane_mode[0]);
|
||||
out_be32(&srds_regs->srdspccr1, srds1_pccr1 |
|
||||
PCCR1_SGMIIF_KX_MASK);
|
||||
break;
|
||||
@@ -269,8 +269,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
|
||||
fdt_set_phy_handle(fdt, compat, addr,
|
||||
"phy_1gkx5");
|
||||
fdt_status_okay_by_alias(fdt, "1gkx_pcs_mdio5");
|
||||
sprintf(buf, "%s%s%s", buf, "lane-g,",
|
||||
(char *)lane_mode[0]);
|
||||
strcat(buf, "lane-g,");
|
||||
strcat(buf, (char *)lane_mode[0]);
|
||||
out_be32(&srds_regs->srdspccr1, srds1_pccr1 |
|
||||
PCCR1_SGMIIC_KX_MASK);
|
||||
break;
|
||||
@@ -281,8 +281,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
|
||||
fdt_set_phy_handle(fdt, compat, addr,
|
||||
"phy_1gkx6");
|
||||
fdt_status_okay_by_alias(fdt, "1gkx_pcs_mdio6");
|
||||
sprintf(buf, "%s%s%s", buf, "lane-h,",
|
||||
(char *)lane_mode[0]);
|
||||
strcat(buf, "lane-h,");
|
||||
strcat(buf, (char *)lane_mode[0]);
|
||||
out_be32(&srds_regs->srdspccr1, srds1_pccr1 |
|
||||
PCCR1_SGMIID_KX_MASK);
|
||||
break;
|
||||
@@ -328,8 +328,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
|
||||
fdt_set_phy_handle(fdt, compat, addr,
|
||||
"phy_xfi9");
|
||||
fdt_status_okay_by_alias(fdt, "xfi_pcs_mdio9");
|
||||
sprintf(buf, "%s%s%s", buf, "lane-a,",
|
||||
(char *)lane_mode[1]);
|
||||
strcat(buf, "lane-a,");
|
||||
strcat(buf, (char *)lane_mode[1]);
|
||||
}
|
||||
break;
|
||||
case FM1_10GEC2:
|
||||
@@ -339,8 +339,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
|
||||
fdt_set_phy_handle(fdt, compat, addr,
|
||||
"phy_xfi10");
|
||||
fdt_status_okay_by_alias(fdt, "xfi_pcs_mdio10");
|
||||
sprintf(buf, "%s%s%s", buf, "lane-b,",
|
||||
(char *)lane_mode[1]);
|
||||
strcat(buf, "lane-b,");
|
||||
strcat(buf, (char *)lane_mode[1]);
|
||||
}
|
||||
break;
|
||||
case FM1_10GEC3:
|
||||
@@ -350,8 +350,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
|
||||
fdt_set_phy_handle(fdt, compat, addr,
|
||||
"phy_xfi1");
|
||||
fdt_status_okay_by_alias(fdt, "xfi_pcs_mdio1");
|
||||
sprintf(buf, "%s%s%s", buf, "lane-c,",
|
||||
(char *)lane_mode[1]);
|
||||
strcat(buf, "lane-c,");
|
||||
strcat(buf, (char *)lane_mode[1]);
|
||||
}
|
||||
break;
|
||||
case FM1_10GEC4:
|
||||
@@ -361,8 +361,8 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
|
||||
fdt_set_phy_handle(fdt, compat, addr,
|
||||
"phy_xfi2");
|
||||
fdt_status_okay_by_alias(fdt, "xfi_pcs_mdio2");
|
||||
sprintf(buf, "%s%s%s", buf, "lane-d,",
|
||||
(char *)lane_mode[1]);
|
||||
strcat(buf, "lane-d,");
|
||||
strcat(buf, (char *)lane_mode[1]);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -156,7 +156,8 @@ int fsl_board_late_init(void)
|
||||
* If the watchdog isn't enabled at reset (which is a configuration
|
||||
* option) disabling it doesn't hurt either.
|
||||
*/
|
||||
if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART))
|
||||
if (IS_ENABLED(CONFIG_WDT_SL28CPLD) &&
|
||||
!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART))
|
||||
stop_recovery_watchdog();
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -50,9 +50,10 @@ int board_fit_config_name_match(const char *name)
|
||||
return strcmp(name, "freescale/fsl-ls1028a-kontron-sl28-var1");
|
||||
case 2:
|
||||
return strcmp(name, "freescale/fsl-ls1028a-kontron-sl28-var2");
|
||||
case 3:
|
||||
return strcmp(name, "freescale/fsl-ls1028a-kontron-sl28-var3");
|
||||
case 4:
|
||||
return strcmp(name, "freescale/fsl-ls1028a-kontron-sl28-var4");
|
||||
case 3:
|
||||
default:
|
||||
return strcmp(name, "freescale/fsl-ls1028a-kontron-sl28");
|
||||
}
|
||||
|
||||
@@ -55,6 +55,7 @@ CONFIG_SPL_BOARD_INIT=y
|
||||
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
|
||||
CONFIG_SPL_HAVE_INIT_STACK=y
|
||||
CONFIG_SPL_SYS_MALLOC=y
|
||||
CONFIG_SPL_SYS_MALLOC_SIZE=0x200000
|
||||
CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
|
||||
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x900
|
||||
CONFIG_SPL_MPC8XXX_INIT_DDR=y
|
||||
@@ -78,7 +79,7 @@ CONFIG_CMD_RNG=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_SPL_OF_CONTROL=y
|
||||
CONFIG_OF_UPSTREAM=y
|
||||
CONFIG_OF_LIST="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var1 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var4"
|
||||
CONFIG_OF_LIST="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var1 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var3 freescale/fsl-ls1028a-kontron-sl28-var4"
|
||||
CONFIG_ENV_OVERWRITE=y
|
||||
CONFIG_ENV_IS_IN_SPI_FLASH=y
|
||||
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
||||
|
||||
@@ -101,3 +101,4 @@ CONFIG_USB_ETHER_ASIX88179=y
|
||||
CONFIG_USB_ETHER_RTL8152=y
|
||||
CONFIG_WDT=y
|
||||
CONFIG_WDT_SP805=y
|
||||
CONFIG_FSL_ESDHC_SUPPORT_ADMA2=y
|
||||
|
||||
@@ -65,12 +65,14 @@ wdt command flags
|
||||
The `wdt start` as well as the `wdt expire` command take a flags argument.
|
||||
The supported bitmask is as follows.
|
||||
|
||||
| Bit | Description |
|
||||
| --- | ----------------------------- |
|
||||
| 0 | Enable failsafe mode |
|
||||
| 1 | Lock the control register |
|
||||
| 2 | Disable board reset |
|
||||
| 3 | Enable WDT_TIME_OUT# line |
|
||||
=== ==============================
|
||||
Bit Description
|
||||
=== ==============================
|
||||
0 Enable failsafe mode
|
||||
1 Lock the control register
|
||||
2 Disable board reset
|
||||
3 Enable WDT_TIME_OUT# line
|
||||
=== ==============================
|
||||
|
||||
For example, you can use `wdt expire 1` to issue a reset and boot into the
|
||||
failsafe bootloader.
|
||||
|
||||
@@ -750,7 +750,7 @@ static int mmc_send_op_cond(struct mmc *mmc)
|
||||
{
|
||||
int err, i;
|
||||
int timeout = 1000;
|
||||
uint start;
|
||||
ulong start;
|
||||
|
||||
/* Some cards seem to need this */
|
||||
mmc_go_idle(mmc);
|
||||
@@ -844,7 +844,8 @@ int mmc_send_ext_csd(struct mmc *mmc, u8 *ext_csd)
|
||||
static int __mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value,
|
||||
bool send_status)
|
||||
{
|
||||
unsigned int status, start;
|
||||
ulong start;
|
||||
unsigned int status;
|
||||
struct mmc_cmd cmd;
|
||||
int timeout_ms = DEFAULT_CMD6_TIMEOUT_MS;
|
||||
bool is_part_switch = (set == EXT_CSD_CMD_SET_NORMAL) &&
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
"board=ls1028ardb\0" \
|
||||
"hwconfig=fsl_ddr:bank_intlv=auto\0" \
|
||||
"fdtfile=fsl-ls1028a-rdb.dtb\0" \
|
||||
"ramdisk_addr=0x800000\0" \
|
||||
"ramdisk_size=0x2000000\0" \
|
||||
"bootm_size=0x10000000\0" \
|
||||
|
||||
Reference in New Issue
Block a user