{"id":781237,"url":"http://patchwork.ozlabs.org/api/patches/781237/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1498573791-6781-1-git-send-email-hare@suse.de/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<1498573791-6781-1-git-send-email-hare@suse.de>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/1498573791-6781-1-git-send-email-hare@suse.de/","date":"2017-06-27T14:29:51","name":"powerpc: conditionally compile platform-specific serial drivers","commit_ref":"866bfc75f40e4f8a00d268f73f3a02f572e6c082","pull_url":null,"state":"accepted","archived":false,"hash":"331ec1b9f3dd56f05502c7977816f7bf47dfccc1","submitter":{"id":992,"url":"http://patchwork.ozlabs.org/api/people/992/?format=json","name":"Hannes Reinecke","email":"hare@suse.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1498573791-6781-1-git-send-email-hare@suse.de/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/781237/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/781237/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3wxpJ51vZMz9s2G\n\tfor ;\n\tWed, 28 Jun 2017 00:31:01 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3wxpJ50wY3zDr40\n\tfor ;\n\tWed, 28 Jun 2017 00:31:01 +1000 (AEST)","from mx1.suse.de (mx2.suse.de [195.135.220.15])\n\t(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3wxpGt0PkjzDr2Z\n\tfor ;\n\tWed, 28 Jun 2017 00:29:57 +1000 (AEST)","from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254])\n\tby mx1.suse.de (Postfix) with ESMTP id 7C1B5AB9D;\n\tTue, 27 Jun 2017 14:29:54 +0000 (UTC)"],"X-Virus-Scanned":"by amavisd-new at test-mx.suse.de","From":"Hannes Reinecke ","To":"Benjamin Herrenschmidt ","Subject":"[PATCH] powerpc: conditionally compile platform-specific serial\n\tdrivers","Date":"Tue, 27 Jun 2017 16:29:51 +0200","Message-Id":"<1498573791-6781-1-git-send-email-hare@suse.de>","X-Mailer":"git-send-email 1.8.5.6","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Hannes Reinecke , linuxppc-dev@lists.ozlabs.org,\n\tHannes Reinecke , Torsten Duwe ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"mpsc.c and mpc52xx-psc.c are platform-specific serial drivers, and\nshould be compiled for the respective platforms only.\n\nSigned-off-by: Hannes Reinecke \n---\n arch/powerpc/boot/Makefile | 7 ++++---\n arch/powerpc/boot/serial.c | 4 ++++\n 2 files changed, 8 insertions(+), 3 deletions(-)","diff":"diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile\nindex e82f333..1a4609c 100644\n--- a/arch/powerpc/boot/Makefile\n+++ b/arch/powerpc/boot/Makefile\n@@ -99,14 +99,15 @@ src-wlib-y := string.S crt0.S crtsavres.S stdio.c decompress.c main.c \\\n \t\t$(libfdt) libfdt-wrapper.c \\\n \t\tns16550.c serial.c simple_alloc.c div64.S util.S \\\n \t\telf_util.c $(zlib-y) devtree.c stdlib.c \\\n-\t\toflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \\\n-\t\tuartlite.c mpc52xx-psc.c opal.c\n+\t\toflib.c ofconsole.c cuboot.c cpm-serial.c \\\n+\t\tuartlite.c opal.c\n+src-wlib-$(CONFIG_PPC_MPC52XX) += mpc52xx-psc.c\n src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) += opal-calls.S\n src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c\n src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c\n src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c\n src-wlib-$(CONFIG_PPC_82xx) += pq2.c fsl-soc.c planetcore.c\n-src-wlib-$(CONFIG_EMBEDDED6xx) += mv64x60.c mv64x60_i2c.c ugecon.c fsl-soc.c\n+src-wlib-$(CONFIG_EMBEDDED6xx) += mpsc.c mv64x60.c mv64x60_i2c.c ugecon.c fsl-soc.c\n \n src-plat-y := of.c epapr.c\n src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \\\ndiff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c\nindex e04c1e4..7b5c02b 100644\n--- a/arch/powerpc/boot/serial.c\n+++ b/arch/powerpc/boot/serial.c\n@@ -120,15 +120,19 @@ int serial_console_init(void)\n \tif (dt_is_compatible(devp, \"ns16550\") ||\n \t dt_is_compatible(devp, \"pnpPNP,501\"))\n \t\trc = ns16550_console_init(devp, &serial_cd);\n+#ifdef CONFIG_EMBEDDED6xx\n \telse if (dt_is_compatible(devp, \"marvell,mv64360-mpsc\"))\n \t\trc = mpsc_console_init(devp, &serial_cd);\n+#endif\n \telse if (dt_is_compatible(devp, \"fsl,cpm1-scc-uart\") ||\n \t dt_is_compatible(devp, \"fsl,cpm1-smc-uart\") ||\n \t dt_is_compatible(devp, \"fsl,cpm2-scc-uart\") ||\n \t dt_is_compatible(devp, \"fsl,cpm2-smc-uart\"))\n \t\trc = cpm_console_init(devp, &serial_cd);\n+#ifdef CONFIG_PPC_MPC52XX\n \telse if (dt_is_compatible(devp, \"fsl,mpc5200-psc-uart\"))\n \t\trc = mpc5200_psc_console_init(devp, &serial_cd);\n+#endif\n \telse if (dt_is_compatible(devp, \"xlnx,opb-uartlite-1.00.b\") ||\n \t\t dt_is_compatible(devp, \"xlnx,xps-uartlite-1.00.a\"))\n \t\trc = uartlite_console_init(devp, &serial_cd);\n","prefixes":[]}