From 73cb9dc0cd8d220de24fe078f7eadc4945a939ef Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Sun, 14 Jun 2015 19:01:37 -0700 Subject: [PATCH 1/2] m68k: Use vsprintf %pM extension Format mac addresses with the normal kernel extension. Signed-off-by: Joe Perches Signed-off-by: Greg Ungerer --- arch/m68k/68000/m68EZ328.c | 3 +-- arch/m68k/68000/m68VZ328.c | 3 +-- arch/m68k/68360/config.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/m68k/68000/m68EZ328.c b/arch/m68k/68000/m68EZ328.c index 21952906e9e2..e6ab321f93f8 100644 --- a/arch/m68k/68000/m68EZ328.c +++ b/arch/m68k/68000/m68EZ328.c @@ -62,8 +62,7 @@ void __init config_BSP(char *command, int len) #ifdef CONFIG_UCSIMM printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum()); p = cs8900a_hwaddr = gethwaddr(0); - printk(KERN_INFO "uCsimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", - p[0], p[1], p[2], p[3], p[4], p[5]); + printk(KERN_INFO "uCsimm hwaddr %pM\n", p); p = getbenv("APPEND"); if (p) strcpy(p,command); diff --git a/arch/m68k/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c index 0e5e5a10a021..1154bdb220a0 100644 --- a/arch/m68k/68000/m68VZ328.c +++ b/arch/m68k/68000/m68VZ328.c @@ -152,8 +152,7 @@ static void __init init_hardware(char *command, int size) printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum()); p = cs8900a_hwaddr = gethwaddr(0); - printk(KERN_INFO "uCdimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", - p[0], p[1], p[2], p[3], p[4], p[5]); + printk(KERN_INFO "uCdimm hwaddr %pM\n", p); p = getbenv("APPEND"); if (p) strcpy(p, command); diff --git a/arch/m68k/68360/config.c b/arch/m68k/68360/config.c index fd1f948c7129..b65fe4eed38e 100644 --- a/arch/m68k/68360/config.c +++ b/arch/m68k/68360/config.c @@ -154,8 +154,7 @@ void __init config_BSP(char *command, int len) #if defined(CONFIG_UCQUICC) && 0 printk(KERN_INFO "uCquicc serial string [%s]\n",getserialnum()); p = scc1_hwaddr = gethwaddr(0); - printk(KERN_INFO "uCquicc hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", - p[0], p[1], p[2], p[3], p[4], p[5]); + printk(KERN_INFO "uCquicc hwaddr %pM\n", p); p = getbenv("APPEND"); if (p) From e1632fa2471281c69bb3b6414d2c0fb01c56cc70 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Fri, 19 Jun 2015 10:40:03 +1000 Subject: [PATCH 2/2] m68k: improve m68knommu MAINTAINERS entry Improve the information in the m68knommu maintainers entry. This should aid in making it clearer what parts of the m68k architecture code can go via the m68knommu git tree. Specifically the entry now lists the relevant git tree where m68knommu patches are promoted through. It also spells out that the coldfire sub-architecture, and with it the directory of arch/m68k/coldfire, as being supported via this tree. Signed-off-by: Greg Ungerer Acked-by: Geert Uytterhoeven --- MAINTAINERS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index d8afd2953678..18c502978700 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10155,11 +10155,15 @@ S: Maintained F: Documentation/filesystems/ubifs.txt F: fs/ubifs/ -UCLINUX (AND M68KNOMMU) +UCLINUX (M68KNOMMU AND COLDFIRE) M: Greg Ungerer W: http://www.uclinux.org/ +L: linux-m68k@lists.linux-m68k.org L: uclinux-dev@uclinux.org (subscribers-only) +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git S: Maintained +F: arch/m68k/coldfire/ +F: arch/m68k/68*/ F: arch/m68k/*/*_no.* F: arch/m68k/include/asm/*_no.*