mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-04 16:34:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "board: qca: arm: ipq5332: remove the flash detection code in fdtfixup"

Browse source
This commit is contained in:
Linux Build Service Account 2022-12-02 10:16:57 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3cdd8dd47a
1 changed files with 0 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
board/qca/arm/ipq5332/ipq5332.c
View file

@ -137,48 +137,6 @@ void fdt_fixup_flash(void *blob)
return;
}
void ipq_uboot_fdt_fixup(void)
{
int node, ret = 0;
char *flash;
void *blob = (void *)gd->fdt_blob;
ulong machid = gd->bd->bi_arch_number;
if (machid == MACH_TYPE_IPQ5332_EMULATION)
return;
/* fix peripherals required for basic board bring up
* like flash etc.
*/
/* This becomes obsolete as nand or emmc will be
* initialized based on the boot type. Below code
* will be removed later
*/
if ((machid >> FLASH_SEL_BIT) & 0x1) {
flash = "mmc";
node = fdt_path_offset(gd->fdt_blob, flash);
if (node >= 0) {
ret = fdt_setprop_string(blob, node, "status", "okay");
if (ret < 0 && ret != -FDT_ERR_NOSPACE)
printf("Unable to set status of %s\n", flash);
} else {
printf("%s node not available\n", flash);
}
flash = "nand";
node = fdt_path_offset(gd->fdt_blob, flash);
if (node >= 0) {
ret = fdt_setprop_string(blob, node, "status", "disabled");
if (ret < 0 && ret != -FDT_ERR_NOSPACE)
printf("Unable to set status of %s\n", flash);
} else {
printf("%s node not available\n", flash);
}
}
return;
}
void qca_serial_init(struct ipq_serial_platdata *plat)
{
int ret;
@ -645,18 +603,6 @@ int ipq_board_usb_init(void)
}
#endif
unsigned int get_dts_machid(unsigned int machid)
{
/* By default nand flash enabled, so flash
* selection bit in mach id in dts is zero.
* For emmc flash this bit will be setted,
* so clear this bit to make machid similar
* to dts mach id.
*/
machid &= ~(1 << FLASH_SEL_BIT);
return machid;
}
__weak int ipq_get_tz_version(char *version_name, int buf_size)
{
return 1;