From patchwork Tue Apr 20 15:03:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1468371 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=PhJXmNOU; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FPn4w479Hz9tkW for ; Wed, 21 Apr 2021 01:03:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5B62D82B23; Tue, 20 Apr 2021 17:03:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="PhJXmNOU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 115BA82B20; Tue, 20 Apr 2021 17:03:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0603.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::603]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1950482B08 for ; Tue, 20 Apr 2021 17:03:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HSOdPWJw4rkXO5SOcV8TldO8uvGuiSIS/I6+55ozT7V/pX63ecEJBhtInqxvbEYHiEDCagfjLpa5EXLtg31ZSDGCYhUXikkvQev6nd3ZkMh5+LMmioVBdOrX5rJ1u4uqBCONHbrcZ/o9skgZsEjfWreUF9LU/5ypsY1uDY+K7K+DNoe0mgefAwV8aQpHjESzVgea61LB618vVN9jNl782olPX7vGzeCk4V/XgyrW3E/2slKT6kvHjO/WP59WkL/uZ6oljeZOCKRcw9ely7UQFliRYuqDMb87515aJBMDkcTUx1hzFsVx7j8bIEVnw3TR2Pt9fSZItzjmh7yZ/arFQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YQ9QG8rmYiGPZfCPzJxR1PNYaeH6UGsf8P0+qlVGcig=; b=MMKg2rbRCU0Gw39W1dR9L96xSbf0Gm3ai3oLgI5e6+dlcy3hkcJD9pCAIBzOi1Sf2IMf7SF6lYn3lYN5UcaaQsmYtBTv9js1rQ1lLBFxeu+tfRb6LlOgOEzeKpqVvzX3erh0OebhevpBTDBcw7PeYuKUdcyXAiEYWHKhqFBCzokx6gnhZM8OXElNIXRMK+H60JbtUvlm4et+2F0Oci/rP3IwvNS51lmBeetBqP7WDvWwYJJfDlSTR7nZ9iMQfJ+F5TRNMXTgw6G8kRngyllosE6c4aXqSId4jNnmBWQY59sDk1qYYec5pp2tNV2HA8/oBIspJ58lafJD7DmBhrWWWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YQ9QG8rmYiGPZfCPzJxR1PNYaeH6UGsf8P0+qlVGcig=; b=PhJXmNOUm60CpwPAsHiv1ZaVlrOGCnzXr8ewVdHYuRPUHTamLIlK1bjy7v7hgPi+ubw8Y/+CUAmr5K/tirERzldUEqzfkV3vxIqsjIjxjqAuDV100yVkytKVjh9lw59AJfCttLr++eUqViezwaiyyBqGJY9JpfybiKc4uRhrBnA= Authentication-Results: konsulko.com; dkim=none (message not signed) header.d=none;konsulko.com; dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0301MB2439.eurprd03.prod.outlook.com (2603:10a6:4:5b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.19; Tue, 20 Apr 2021 15:03:23 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9181:c45f:b367:9bdc]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9181:c45f:b367:9bdc%5]) with mapi id 15.20.4065.020; Tue, 20 Apr 2021 15:03:23 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH] test: Alphabetize dm Makefile Date: Tue, 20 Apr 2021 11:03:12 -0400 Message-Id: <20210420150312.3934673-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL1PR13CA0325.namprd13.prod.outlook.com (2603:10b6:208:2c1::30) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL1PR13CA0325.namprd13.prod.outlook.com (2603:10b6:208:2c1::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.7 via Frontend Transport; Tue, 20 Apr 2021 15:03:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cbe2d737-a734-416b-9a32-08d9040d7136 X-MS-TrafficTypeDiagnostic: DB6PR0301MB2439: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 22hzQRUEjlNW8foDYynIkr8M6/MLD51qfn6xh1AhAyqynLqdP13SDeE9EiS+Mx9oVIclf6dbJicFfRr2UCIzxDUnl7MwcROY5CDjmaZxlk+rRFjWUVseg3kt9age/ARHwJof+qZCnUClSFDk1OaYTXEZ40steXwYmzsHe/gUNImfdQUvuEZStfKC1tfTc9bj91RXd3Cz/YFQ9N7ZajW3yKvckJ4K1Gu375ry0yp3s/NbFP142uO6dzfGXzA4wlktrHMuH6kwo707RRwTb6Ee7JMmNP7QOgk2YCounBjnoVrfUkf7/yEJegtzu+Ka4yt4dCnxygO2ab+BWYgi/FbM6+xM4S9I221Yk7G0oICFCENkhBDNCRjVusi7ZS3ZzPSWQRtJNvSlMtnahvha8UnlI6ihKn3zFFZlEHeo5WTmG8NfrS63ZrnBgwv7xKJLGO94H0jwF8ArOR71arZK/d6fU/LA/C8TTa9fLh6cIhRbYj0uMphm4eOk6aNbTwUpU+eqRh2F8hYRhPUj6wbSGZmkUvHBGcYz2pv0ORacQ8qnUYZMzhCKZUXWbTXMLijuBPHkOeKkcK26dA8tvm/s4Y/5jSwlT2O3r8Y6K1IhnDExPJCQU0jDVFyL4+EDnBjuzERpfpCRGNZBFvcb3/nKnAcWxFwELWBffQL6Dw8fZcr0czQ= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(8936002)(86362001)(66556008)(54906003)(8676002)(107886003)(956004)(38100700002)(26005)(66476007)(16526019)(66946007)(2906002)(6506007)(186003)(2616005)(4326008)(52116002)(6666004)(5660300002)(36756003)(83380400001)(6486002)(1076003)(6512007)(38350700002)(498600001)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 1eEjESTFfl6BAz6PdZGHgJtxDOAyyEJ7Ui64LSk1X4SijHpunoso0Mm6qmT3HL5lOXzGGyBfm5SCUlg0Y5u9KRz8RRW5mXjIu2bpwpRZlZK6Nq2bzFBd0M7kUar7OsueKsWq0NTB1OQhRMDGXXloGDXFu7loO8BlbLomKDaxS5dVOMNysf2R/2Oso6k3co1EHQd4r/TL79D0ZwHDSwJkLARtuQpuFWnVuGr8nMW2tqN5OzrBaNynVGlVZCEGDA72UHsGkkzjF4SuI0/4mmEjuvYF2ga3IHUPfr4ZN2Uc9P7+jejBCc+uW7NOash4zcUSRXIYBJEDIFQeuzbZ/FUTsnDgkYGO+d0118BODlfsOb3iXtGNZOwcd2RD0/FYA7wNiFxNmF7cZzNm/HbpwXRSrcLOjoVZTFO2XFry8b/gjf+KS5pF8oxac/qEPmEsLrEB9xhpBqdGgvYkYSeGJYswj5AXaIG0flVgqVCoCGPS5DtA8EfcCVrUKvNa4ADhn0yBEhaYraIVq15tsmJpjMtnNj7/3g8hdJov9QskfN1XRS6jz/KcgbI1u2Cnt5DM2yw2sakm5aP8DU4GTgJYcy7xCM41jznp8T7O4akm6VynBEuMfbh5sc9v67TYRg7/tHeKtLE8KqkuNXwb+62lX2MvFPzXZUVs0s2UE0jd+SJcpqWbeqwnLKalBnnfiAU23qVrQZn2OvnFZmnl7vngr9mFr2KosPNfLz7FfCFtS03ujdf8rd1r6frH32JKfJKENbRqVqLp05Ur27sqYoNCW23QA9KjkwSSUzBbfmrzZnQpe/ru2zyeCpB8jiydyNf9ZIS2ZXZbNlOmdwN8MVZtE5QgIlpCmwrfCyfL2SxOTQAkpBcgsIZmeLBSB1iuGFC3ckfMn4ud1GRIHlz3AJegfljbEPBqHW/hbRc0/I0DbTkS6/id0loAyWSMu2w82pijSTkoY3ws9/P5aNhEuJIqiXKMAtMMFb8/I/TA0jooSVb4uLGRvaRFHekttVK+PWYEjLXavDpSxwXCpV8zyEFZW5Z8aUnNIQsAM+UY1IVQvu5stnxnRq2mHiM/u9tg8968uGhUs5BK+vA870Xb34fO/9Oc99jJU24SAAmc04UNAjD2ZT2dQgNl9ZjuAVOFsjoaor9Dmp4l6UjnrS5VJHBahp1L4byJXPtfdPvc8VcbD3UvZV6G6EqBOASLI17rJaohVQEuxnSxthUoZtxujX+Vw0czn/6vRSr/kesVy//tWZS3d3LnX1Edb8dpzQrq+C9dx8iCruBUWtiNwLrlMhDBT4S6PwIomRde8lNNBUzedbUtlRfFIPAzprfSKN4MA4jKXUNM X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: cbe2d737-a734-416b-9a32-08d9040d7136 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2021 15:03:23.1234 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qiC1o6IKvuD7K5dXZggkOfGGI3pQ9TbOuMbfp3TgdDOs+mNpsSuwbDWNEEQvfGD+GjipXF44kgjexZy95JcF/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0301MB2439 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Recently, tests have been added primarily to the end of the dm Makefile. This results in merge conflicts when two people add new tests at the same time. To reduce these conflicts, alphabetize the makefile. Signed-off-by: Sean Anderson --- test/dm/Makefile | 64 ++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/test/dm/Makefile b/test/dm/Makefile index 100e7701d2..52a8c932b8 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -21,26 +21,39 @@ ifneq ($(CONFIG_SANDBOX),) obj-$(CONFIG_ACPIGEN) += acpi.o obj-$(CONFIG_ACPIGEN) += acpigen.o obj-$(CONFIG_ACPIGEN) += acpi_dp.o +obj-$(CONFIG_ADC) += adc.o obj-$(CONFIG_SOUND) += audio.o +obj-$(CONFIG_AXI) += axi.o obj-$(CONFIG_BLK) += blk.o obj-$(CONFIG_BUTTON) += button.o obj-$(CONFIG_DM_BOOTCOUNT) += bootcount.o obj-$(CONFIG_CLK) += clk.o clk_ccf.o +obj-$(CONFIG_CPU) += cpu.o obj-$(CONFIG_CROS_EC) += cros_ec.o obj-$(CONFIG_DEVRES) += devres.o +obj-$(CONFIG_DMA) += dma.o obj-$(CONFIG_VIDEO_MIPI_DSI) += dsi_host.o obj-$(CONFIG_DM_DSA) += dsa.o obj-$(CONFIG_DM_ETH) += eth.o +ifneq ($(CONFIG_EFI_PARTITION),) +obj-$(CONFIG_FASTBOOT_FLASH_MMC) += fastboot.o +endif obj-$(CONFIG_FIRMWARE) += firmware.o obj-$(CONFIG_DM_GPIO) += gpio.o obj-$(CONFIG_DM_HWSPINLOCK) += hwspinlock.o obj-$(CONFIG_DM_I2C) += i2c.o obj-$(CONFIG_SOUND) += i2s.o obj-y += irq.o +obj-$(CONFIG_CLK_K210_SET_RATE) += k210_pll.o obj-$(CONFIG_LED) += led.o obj-$(CONFIG_DM_MAILBOX) += mailbox.o +obj-$(CONFIG_DM_MDIO) += mdio.o +obj-$(CONFIG_DM_MDIO_MUX) += mdio_mux.o +obj-$(CONFIG_MISC) += misc.o obj-$(CONFIG_DM_MMC) += mmc.o obj-$(CONFIG_CMD_MUX) += mux-cmd.o +obj-$(CONFIG_MULTIPLEXER) += mux-emul.o +obj-$(CONFIG_MUX_MMIO) += mux-mmio.o obj-y += fdtdec.o obj-$(CONFIG_UT_DM) += nop.o obj-y += ofnode.o @@ -53,53 +66,40 @@ obj-$(CONFIG_P2SB) += p2sb.o obj-$(CONFIG_PCI_ENDPOINT) += pci_ep.o obj-$(CONFIG_PCH) += pch.o obj-$(CONFIG_PHY) += phy.o +ifneq ($(CONFIG_PINMUX),) +obj-$(CONFIG_PINCONF) += pinmux.o +endif obj-$(CONFIG_POWER_DOMAIN) += power-domain.o obj-$(CONFIG_ACPI_PMC) += pmc.o +obj-$(CONFIG_DM_PMIC) += pmic.o obj-$(CONFIG_DM_PWM) += pwm.o +obj-$(CONFIG_QFW) += qfw.o obj-$(CONFIG_RAM) += ram.o obj-y += regmap.o obj-$(CONFIG_REMOTEPROC) += remoteproc.o obj-$(CONFIG_DM_RESET) += reset.o obj-$(CONFIG_SYSRESET) += sysreset.o +obj-$(CONFIG_DM_REGULATOR) += regulator.o +obj-$(CONFIG_DM_RNG) += rng.o obj-$(CONFIG_DM_RTC) += rtc.o +obj-$(CONFIG_SCMI_FIRMWARE) += scmi.o +obj-$(CONFIG_DM_SERIAL) += serial.o obj-$(CONFIG_DM_SPI_FLASH) += sf.o +obj-$(CONFIG_SIMPLE_BUS) += simple-bus.o +obj-$(CONFIG_SIMPLE_PM_BUS) += simple-pm-bus.o obj-$(CONFIG_SMEM) += smem.o -obj-$(CONFIG_DM_SPI) += spi.o -obj-y += syscon.o -obj-$(CONFIG_MUX_MMIO) += mux-mmio.o -obj-$(CONFIG_MULTIPLEXER) += mux-emul.o -obj-$(CONFIG_DM_USB) += usb.o -obj-$(CONFIG_DM_PMIC) += pmic.o -obj-$(CONFIG_DM_REGULATOR) += regulator.o -obj-$(CONFIG_TIMER) += timer.o -obj-$(CONFIG_DM_VIDEO) += video.o -obj-$(CONFIG_ADC) += adc.o -obj-$(CONFIG_SPMI) += spmi.o -obj-$(CONFIG_WDT) += wdt.o -obj-$(CONFIG_AXI) += axi.o -obj-$(CONFIG_MISC) += misc.o -obj-$(CONFIG_DM_SERIAL) += serial.o -obj-$(CONFIG_CPU) += cpu.o obj-$(CONFIG_SOC_DEVICE) += soc.o obj-$(CONFIG_SOUND) += sound.o +obj-$(CONFIG_DM_SPI) += spi.o +obj-$(CONFIG_SPMI) += spmi.o +obj-y += syscon.o +obj-$(CONFIG_RESET_SYSCON) += syscon-reset.o obj-$(CONFIG_SYSINFO) += sysinfo.o obj-$(CONFIG_TEE) += tee.o +obj-$(CONFIG_TIMER) += timer.o +obj-$(CONFIG_DM_USB) += usb.o +obj-$(CONFIG_DM_VIDEO) += video.o obj-$(CONFIG_VIRTIO_SANDBOX) += virtio.o -obj-$(CONFIG_DMA) += dma.o -obj-$(CONFIG_DM_MDIO) += mdio.o -obj-$(CONFIG_DM_MDIO_MUX) += mdio_mux.o -obj-$(CONFIG_DM_RNG) += rng.o -obj-$(CONFIG_CLK_K210_SET_RATE) += k210_pll.o -obj-$(CONFIG_SIMPLE_BUS) += simple-bus.o -obj-$(CONFIG_SIMPLE_PM_BUS) += simple-pm-bus.o -obj-$(CONFIG_RESET_SYSCON) += syscon-reset.o -obj-$(CONFIG_SCMI_FIRMWARE) += scmi.o -ifneq ($(CONFIG_PINMUX),) -obj-$(CONFIG_PINCONF) += pinmux.o -endif -ifneq ($(CONFIG_EFI_PARTITION),) -obj-$(CONFIG_FASTBOOT_FLASH_MMC) += fastboot.o -endif -obj-$(CONFIG_QFW) += qfw.o +obj-$(CONFIG_WDT) += wdt.o endif endif # !SPL