Skip to content

fullhan: FH8626V100 boots a 4.9 kernel, so its flash is spi0.0 #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dimerr merged 1 commit into from
Oct 30, 2026
Merged

fullhan: FH8626V100 boots a 4.9 kernel, so its flash is spi0.0 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions common/openipc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,23 @@ static ulong kernel_image_size(void *buf) {
return 0;
}

#ifdef SFC
/*
* FH8626V100 U-Boots before this one defaulted mtdids to the 3.0.8 kernels'
* "spi_flash", but OpenIPC boots FH8626V100 on 4.9, where the flash is
* "spi0.0": with the old name saved, the kernel ignores mtdparts and cannot
* mount its root. Only that exact value is replaced.
*/
static int stale_mtdids(const char *ids)
{
#ifdef CONFIG_FULLHAN_8626
return !strcmp(ids, "spi_flash");
#else
return 0;
#endif
}
#endif

static int scan_spi_device(struct spi_flash *flash, ulong *kernel_off, ulong *rootfs_off, uint64_t *kernel_size,
uint64_t *rootfs_size) {
u8 *buf;
Expand Down Expand Up @@ -842,8 +859,10 @@ int firmware_scan(void) {
sprintf(str, "0x%lx", root_slot);
env_set("rootsize", str);
#ifdef SFC
if (!mtdids || !*mtdids)
if (!mtdids || !*mtdids || stale_mtdids(mtdids)) {
mtdids = SFC;
env_set("mtdids", mtdids);
}
#endif
/* U-Boot's own idea of the flash; the kernel is not told. */
sprintf(mtds, "%dk(u-boot),%dk(env),-(firmware)",
Expand Down Expand Up @@ -889,8 +908,10 @@ int firmware_scan(void) {
* build drives, as its own default environment does.
*/
#ifdef SFC
if (!mtdids || !*mtdids)
if (!mtdids || !*mtdids || stale_mtdids(mtdids)) {
mtdids = SFC;
env_set("mtdids", mtdids);
}
#endif
sprintf(mtds, "%dk(u-boot),%dk(env),%lldk(kernel),%lldk(rootfs),%lldk@0x%lx(firmware),-(rootfs_data)",
CONFIG_ENV_OFFSET / 1024, CONFIG_ENV_SIZE / 1024, kernel_size / 1024, rootfs_size / 1024,
Expand Down
9 changes: 6 additions & 3 deletions include/configs/openipc-common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,13 @@
"bootflash=run fwrecovery; setenv setargs setenv bootargs ${bootargs}; run setargs; run loadkernel; bootm ${baseaddr}; reset\0"

/*
* The flash's MTD name in the vendor kernels: the SPI device under 4.9's
* spi-nor, the m25p80 platform data's name under 3.0.8
* The flash's MTD name in the kernels OpenIPC boots: the SPI device under
* 4.9's spi-nor, the m25p80 platform data's name under 3.0.8. FH8626V100
* runs 4.9 (OpenIPC/linux fullhan-fh8852v200), whatever the vendor's
* 3.0.8 SDK for it used.
*/
#if defined(CONFIG_FULLHAN_V200) || defined(CONFIG_FULLHAN_865X)
#if defined(CONFIG_FULLHAN_V200) || defined(CONFIG_FULLHAN_865X) || \
defined(CONFIG_FULLHAN_8626)
#define SFC "spi0.0"
#else
#define SFC "spi_flash"
Expand Down
Loading