[PATCH] fdisk: Add support for Microblaze

Denys Vlasenko vda.linux at googlemail.com
Mon Jan 31 04:55:01 UTC 2011


On Thursday 27 January 2011 15:33, Rob Landley wrote:
> On 01/27/2011 05:38 AM, Michal Simek wrote:
> > This patch add the support to fdisk utility.
> > 
> > Signed-off-by: Michal Simek <monstr at monstr.eu>
> > ---
> >  util-linux/fdisk_osf.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
> > index 79be0cd..5706978 100644
> > --- a/util-linux/fdisk_osf.c
> > +++ b/util-linux/fdisk_osf.c
> > @@ -47,7 +47,7 @@
> >   || defined(__m68k__) || defined(__mips__) || defined(__s390__) \
> >   || defined(__s390__) || defined(__s390x__) \
> >   || defined(__sh__) || defined(__x86_64__) || defined(__avr32__) \
> > - || defined(__nds32__)
> > + || defined(__nds32__) || defined(__microblaze__)
> >  # define BSD_LABELSECTOR   1
> >  # define BSD_LABELOFFSET   0
> >  #elif defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
> 
> Back before when I was banging on Hexagon (before Qualcomm got a
> multi-month budget renewal gap and I wandered off to do something else)
> I had to add a Hexagon stanza to fdisk too.  Despite the fact that
> there's pretty much only about four minor behavior variations fdisk
> does, and all but one of those behaviors are for ancient targets with
> screwy historical breakage.
> 
> I realize we inherited this mess from upstream, but is there some way to
> kill it with fire?  (Or at least refactor it to have a sane "else" case,
> which would make 80% of it go away and most new platforms not care?)

Like this?

diff -ad -urpN busybox.0/util-linux/fdisk_osf.c busybox.1/util-linux/fdisk_osf.c
--- busybox.0/util-linux/fdisk_osf.c    2011-01-31 05:50:35.000000000 +0100
+++ busybox.1/util-linux/fdisk_osf.c    2011-01-31 05:54:10.000000000 +0100
@@ -43,19 +43,15 @@
 
 #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
 
-#if defined(i386) || defined(__sparc__) || defined(__arm__) \
- || defined(__m68k__) || defined(__mips__) || defined(__s390__) \
- || defined(__s390__) || defined(__s390x__) \
- || defined(__sh__) || defined(__x86_64__) || defined(__avr32__) \
- || defined(__nds32__)
-# define BSD_LABELSECTOR   1
-# define BSD_LABELOFFSET   0
-#elif defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
+#if defined(__alpha__) \
+ || defined(__powerpc__) \
+ || defined(__ia64__) \
  || defined(__hppa__)
 # define BSD_LABELSECTOR   0
 # define BSD_LABELOFFSET   64
 #else
-# error unknown architecture
+# define BSD_LABELSECTOR   1
+# define BSD_LABELOFFSET   0
 #endif
 
 #define BSD_BBSIZE        8192          /* size of boot area, with label */


-- 
vda


More information about the busybox mailing list