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

Commit edaf6c38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68k arch fixes from Greg Ungerer:
 "This contains four fixes for 3.4.  Two fix and clean up compilation
  for the nommu 68x328 CPU targets.  The other two fix the platform
  definition and multi-function pin setup of the second eth interface
  on the ColdFire 5275 SoC."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: make sure 2nd FEC eth interface pins are enabled on 5275 ColdFire
  m68knommu: fix id number for second eth device on 5275 ColdFire
  m68knommu: move and fix the 68VZ328 platform bootlogo.h
  m68knommu: remove the unused bootlogo.h processing for 68EZ328 and 68VZ328
parents c6f5c930 938ed250

arch/m68k/configs/m5275evb_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ CONFIG_BLK_DEV_RAM=y 
CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_FEC=y

CONFIG_FEC2=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_PPP=y

arch/m68k/platform/527x/config.c

+0 −2
Original line number Diff line number Diff line
@@ -74,9 +74,7 @@ static void __init m527x_fec_init(void) 
	writew(par | 0xf00, MCF_IPSBAR + 0x100082);

	v = readb(MCF_IPSBAR + 0x100078);

	writeb(v | 0xc0, MCF_IPSBAR + 0x100078);

#endif



#ifdef CONFIG_FEC2

	/* Set multi-function pins to ethernet mode for fec1 */

	par = readw(MCF_IPSBAR + 0x100082);

	writew(par | 0xa0, MCF_IPSBAR + 0x100082);

arch/m68k/platform/68EZ328/Makefile

+0 −6
Original line number Diff line number Diff line
@@ -3,9 +3,3 @@ 
#



obj-y := config.o
 


extra-y := bootlogo.rh



$(obj)/bootlogo.rh: $(src)/bootlogo.h

	perl $(src)/../68328/bootlogo.pl < $(src)/bootlogo.h \

		> $(obj)/bootlogo.rh

arch/m68k/platform/68VZ328/Makefile

+2 −7
Original line number Diff line number Diff line
@@ -3,14 +3,9 @@ 
#



obj-y		:= config.o

logo-$(UCDIMM)	:= bootlogo.rh

logo-$(DRAGEN2)	:= screen.h

extra-y		:= $(logo-y)



$(obj)/bootlogo.rh: $(src)/../68EZ328/bootlogo.h

	perl $(src)/bootlogo.pl < $(src)/../68328/bootlogo.h > $(obj)/bootlogo.rh

extra-$(DRAGEN2):= screen.h



$(obj)/screen.h: $(src)/screen.xbm $(src)/xbm2lcd.pl

	perl $(src)/xbm2lcd.pl < $(src)/screen.xbm > $(obj)/screen.h



clean-files := $(obj)/screen.h $(obj)/bootlogo.rh
 
clean-files := $(obj)/screen.h

arch/m68k/platform/68EZ328/bootlogo.h→arch/m68k/platform/68VZ328/bootlogo.h

+1 −1
Original line number Diff line number Diff line 
#define splash_width 640

#define splash_height 480

static unsigned char splash_bits[] = {

unsigned char __attribute__ ((aligned(16))) bootlogo_bits[] = {

  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,