Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 680e58f8 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: unify kernel/idprom.c 



o in sparc32 variant removed prom_halt in warning situations
o ifdef out sparc32 specific code

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d3a7001

arch/sparc/kernel/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ obj-y += process_$(BITS).o 
obj-y                   += signal_$(BITS).o

obj-y                   += signal_$(BITS).o

obj-$(CONFIG_SPARC32)   += ioport.o

obj-$(CONFIG_SPARC32)   += ioport.o

obj-y                   += setup_$(BITS).o

obj-y                   += setup_$(BITS).o

obj-y                   += idprom_$(BITS).o

obj-y                   += idprom.o

obj-y                   += sys_sparc_$(BITS).o

obj-y                   += sys_sparc_$(BITS).o

obj-$(CONFIG_SPARC32)   += systbls_32.o

obj-$(CONFIG_SPARC32)   += systbls_32.o

obj-y                   += time_$(BITS).o

obj-y                   += time_$(BITS).o

arch/sparc/kernel/idprom_32.c→arch/sparc/kernel/idprom.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
struct idprom *idprom;

struct idprom *idprom;

static struct idprom idprom_buffer;

static struct idprom idprom_buffer;





#ifdef CONFIG_SPARC32

#include <asm/machines.h>  /* Fun with Sun released architectures. */

#include <asm/machines.h>  /* Fun with Sun released architectures. */





/* Here is the master table of Sun machines which use some implementation

/* Here is the master table of Sun machines which use some implementation
@@ -61,9 +62,12 @@ static void __init display_system_type(unsigned char machtype) 
	}

	}





	prom_printf("IDPROM: Warning, bogus id_machtype value, 0x%x\n", machtype);

	prom_printf("IDPROM: Warning, bogus id_machtype value, 0x%x\n", machtype);

	prom_halt();

}

}



#else

static void __init display_system_type(unsigned char machtype)

{

}

#endif

/* Calculate the IDPROM checksum (xor of the data bytes). */

/* Calculate the IDPROM checksum (xor of the data bytes). */

static unsigned char __init calc_idprom_cksum(struct idprom *idprom)

static unsigned char __init calc_idprom_cksum(struct idprom *idprom)

{

{
@@ -82,16 +86,12 @@ void __init idprom_init(void) 




	idprom = &idprom_buffer;

	idprom = &idprom_buffer;





	if (idprom->id_format != 0x01) {

	if (idprom->id_format != 0x01)

		prom_printf("IDPROM: Warning, unknown format type!\n");

		prom_printf("IDPROM: Warning, unknown format type!\n");

		prom_halt();

	}





	if (idprom->id_cksum != calc_idprom_cksum(idprom)) {

	if (idprom->id_cksum != calc_idprom_cksum(idprom))

		prom_printf("IDPROM: Warning, checksum failure (nvram=%x, calc=%x)!\n",

		prom_printf("IDPROM: Warning, checksum failure (nvram=%x, calc=%x)!\n",

			    idprom->id_cksum, calc_idprom_cksum(idprom));

			    idprom->id_cksum, calc_idprom_cksum(idprom));

		prom_halt();

	}





	display_system_type(idprom->id_machtype);

	display_system_type(idprom->id_machtype);

arch/sparc/kernel/idprom_64.c

deleted100644 → 0
+0 −49
Original line number Original line Diff line number Diff line 
/*

 * idprom.c: Routines to load the idprom into kernel addresses and

 *           interpret the data contained within.

 *

 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)

 */



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/init.h>



#include <asm/oplib.h>

#include <asm/idprom.h>



struct idprom *idprom;

static struct idprom idprom_buffer;



/* Calculate the IDPROM checksum (xor of the data bytes). */

static unsigned char __init calc_idprom_cksum(struct idprom *idprom)

{

	unsigned char cksum, i, *ptr = (unsigned char *)idprom;



	for (i = cksum = 0; i <= 0x0E; i++)

		cksum ^= *ptr++;



	return cksum;

}



/* Create a local IDPROM copy and verify integrity. */

void __init idprom_init(void)

{

	prom_get_idprom((char *) &idprom_buffer, sizeof(idprom_buffer));



	idprom = &idprom_buffer;



	if (idprom->id_format != 0x01)  {

		prom_printf("IDPROM: Warning, unknown format type!\n");

	}



	if (idprom->id_cksum != calc_idprom_cksum(idprom)) {

		prom_printf("IDPROM: Warning, checksum failure (nvram=%x, calc=%x)!\n",

			    idprom->id_cksum, calc_idprom_cksum(idprom));

	}



	printk("Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n",

	       idprom->id_ethaddr[0], idprom->id_ethaddr[1],

	       idprom->id_ethaddr[2], idprom->id_ethaddr[3],

	       idprom->id_ethaddr[4], idprom->id_ethaddr[5]);

}