From 547739cc003a68f43a13981e5de1143861eca08c Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Thu, 25 Feb 2021 13:06:03 -0800 Subject: [PATCH] [ar71xx] Fix routerstation / routerstation pro redboot FIS probing Some changes back in ye olde times somewhere has changed the default block size the flash device exposes. So, the default geom redboot FIS probing (to find the partition table structure in flash!) is no longer finding it. So, force it to probe at the last 64k of flash regardless of the underlying flash block size. Tested: * Ubiquiti Routerstation pro, boots -HEAD MIPS --- sys/mips/conf/ROUTERSTATION.hints | 4 ++++ sys/mips/conf/RSPRO.hints | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/mips/conf/ROUTERSTATION.hints b/sys/mips/conf/ROUTERSTATION.hints index 7b35b229af30..c5740c035d8f 100644 --- a/sys/mips/conf/ROUTERSTATION.hints +++ b/sys/mips/conf/ROUTERSTATION.hints @@ -46,3 +46,7 @@ hint.gpioled.0.at="gpiobus0" hint.gpioled.0.name="rf" # pin 2 hint.gpioled.0.pins=0x0004 + +# Override this to ensure we definitely point to the last 64K of the +# 16MiB flash chip in case underlying block size of the flash driver changes. +hint.redboot.0.fisoffset="0xff0000" diff --git a/sys/mips/conf/RSPRO.hints b/sys/mips/conf/RSPRO.hints index a802328db3b5..6ed26ec0b9e6 100644 --- a/sys/mips/conf/RSPRO.hints +++ b/sys/mips/conf/RSPRO.hints @@ -47,3 +47,7 @@ hint.gpioled.0.at="gpiobus0" hint.gpioled.0.name="rf" # pin 2 hint.gpioled.0.pins=0x0004 + +# Override this to ensure we definitely point to the last 64K of the +# 16MiB flash chip in case underlying block size of the flash driver changes. +hint.redboot.0.fisoffset="0xff0000"