From patchwork Mon Dec 30 08:28:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 968 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 17FD23F076 for ; Mon, 30 Dec 2019 09:28:42 +0100 (CET) Received: by mail-pj1-f72.google.com with SMTP id q88sf13040183pjb.2 for ; Mon, 30 Dec 2019 00:28:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577694521; cv=pass; d=google.com; s=arc-20160816; b=RsTcwdirUeR58f3jraIKMY3s9VEQdzwwMHivlP85kk9c+KnxYvQsQu+aLcPs4GG/z7 tq281oSRmS8bbzflpePWAHqqcI7CNfeODkzsxAR3rN+h+eDz/euXQvzqT1lNlG3Hmkhr gvVxUjdGr3qbOeXkbTY59waL3FrlUmY2hczijUPf2akHGnh/Kl/ao47DRAjNr/SkCeef A2XS2/advQuL4/GLnDQq6jjVAhA/gS6HWSvXshqFIJtRoEmLSM3uo7nJ7gFFC9nPbXpk 1oknynvwUmLp//o7lra9woSqojNSpINPqW/BobP0sR7IA9cV0XnaMDTPWIrHeGRzxvQd O4aQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=4nvL8e1dT3FsiRAvlY8jIMXQXBk//UWgYisAjG5A0dM=; b=T2xEYm8WyoPRaJSx8MofYkz1kaZxx9Xjtl1umKlLopOiTShrAxTLjl5HdmmhlAJ4zU T+9asP4I3UVCkD+Vby6wtTIfQWNRmS1PznTW/7ifhwToLMeEt+boxvw2zh6dEMdSP2rj nX88x9zDXJ5Z3F5BrAube8f1OTjSmTKPkEobVx8pmNHllAtDeNDerjG51n2cfN7SWDT4 OkmwgP2KXbl0nAub8VKbKK9Ru8OeTf+50o5CRa+gGI37gaqV1UVMEiHlYLqryDwzsWi8 rYUQTKUQufn/1zI7wyL8x94QWjWbzmLiwKq6r0Qc4BMm9DBViftFmMcEEw4mUTpSu4u8 SAsQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=V3RTxdvC; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=4nvL8e1dT3FsiRAvlY8jIMXQXBk//UWgYisAjG5A0dM=; b=TAf3g/J2dVe4jNGKaEwH9WZVJjbPpcDUKSrZz6dXcjKiJkNsEwGeJQE52Cv/DoF0KP MoVZd/fKqF3MBIVuDrYVwWk11pL1stI7/pfJL80klAzCTuyhvSXG95xkQk+v+Rj/UsmZ rz6oxOAyDBzZfwj7V45Y1RzxABuJZbE4dv8VE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=4nvL8e1dT3FsiRAvlY8jIMXQXBk//UWgYisAjG5A0dM=; b=lsp8j+iuxhPYGpSStOvej5iN3zDxIrXMsn+pk7NqHiZBduOHafBGMvBFn0sgd2yMGI ahQHYIsnBs0sMD6+5nZDnedurOQzKfFpuHcbrntWwGXbeZPJu5mt5cmxvs7udGBBRyr3 HHutTtJGeMlTshaI2Sm/nkgCE06wn/FDSaNRC9wT6vGZj+voNdrvMdU2o7eU+oucR03Z TAIMBcYp7XAxHvx/0hiNBsxlRY4jXACd3vGxrq5j1VD9phHjrsJQzvf2K04ny14Z1xoC XBjtgwzZppEmU13ubpbmXnyt9B+LaK3ejp87Gpg2f5dedMl5L23GXtU0Awkk/MvrPfhm w9nQ== X-Gm-Message-State: APjAAAXFRMLA4eflsUXliGOZpvPdL2BoiZnzVZnsAefB3zmvNYk+MvLF BdMsTU21G/yGWvTm505pMHur1H0J X-Google-Smtp-Source: APXvYqwMmItsRjYrX3wfSwKyFdCsFXSVnw6+0Y9oGZi1Amrj5iNnheY0dZ2nNdJwvoCsW+XydGmmIg== X-Received: by 2002:a17:90a:660b:: with SMTP id l11mr44249853pjj.47.1577694520927; Mon, 30 Dec 2019 00:28:40 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:8744:: with SMTP id i65ls9767386pfe.11.gmail; Mon, 30 Dec 2019 00:28:40 -0800 (PST) X-Received: by 2002:a63:2355:: with SMTP id u21mr69091595pgm.179.1577694520348; Mon, 30 Dec 2019 00:28:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577694520; cv=none; d=google.com; s=arc-20160816; b=DPPj/jhhCZbCxQkUpJOviKp8n4dX5FB/l7++Wlp/tb38e1tf+1Owz8FynwQI4olhPE bdXaAvp2zsfiepfpIdU4pFk3cZuPWV7bASSq9zPM4Qu/xooNZUQodZ313NwTX4XbNpnY i8B410mM+xxY96G3P8KID5unv9c4pAntg/apsNwZ0cwEonDfX5RGXZXJoL+NhUrbI8Ga /LZtKaojRkoKdxXxVTQQR8YRTlpSfj2LeYjo1+bT4Evzcoh53sZYJDAcQSYI6u3UE3tL i1KsIvk9qM7ww7EsLp0QnwGD5wRdMy3OWER8C9zL4vDibXa8h4s+E8xB6mfv1ONdylL3 0aYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=JtUK6y5W/bJkr2xE34zoKJTJmMmJpC6RCrAHlI8mB6k=; b=MA0OUlTEUGv9rR5GXj+ecyyivpCqq1cTBGIop2xpx8gl2dTaouGrrOl9DYbivwjg+o EoBpTGqojyyVWt8Q85k1WxsbJNb/k04imMJYynAEd78U7A90fBbg1kE/u22an8tEMkrT 7IwylU1so7Ge8UeqgBF7zusDCsJ4wtE6SgbID/YoMFfm7PhVJzK8fsKsFkFa9gxobFRW tWDf01MPfXanT8dMs57Ambztis4dniHypbJJrS9Vv0mqcokts1ajnOSrYes9WYV44Uxp vTeoBa9SNwcpnkOSHN38vQlfzrw3L8DpBPcF3JITjDdhdAyg7sS+i9hhd5TrQiHhc2aA zTsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=V3RTxdvC; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id gi9sor23007173pjb.2.2019.12.30.00.28.40 for (Google Transport Security); Mon, 30 Dec 2019 00:28:40 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:3ae5:: with SMTP id b92mr43210339pjc.26.1577694520063; Mon, 30 Dec 2019 00:28:40 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id s1sm46240652pgv.87.2019.12.30.00.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 00:28:39 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v5 4/7] Makefile: rockchip: Use u-boot preferred spl name Date: Mon, 30 Dec 2019 13:58:16 +0530 Message-Id: <20191230082819.30191-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230082819.30191-1-jagan@amarulasolutions.com> References: <20191230082819.30191-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=V3RTxdvC; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Most of the platforms uses the platform type and particular boot stage on their image naming conventions in makefile like, u-boot-sunxi-with-spl.bin - Allwinner U-Boot with SPL u-boot-spl-mtk.bin - Mediatek SPL bin This would help to understand the users to what that particular image belongs to? and less confused. On that note, use u-boot-spl-rockchip.bin instead of idbloader.img. idbloader.img is still a proper naming for rockchip external documentation but u-boot preferred spl name would always good choice in upstream tree. Also, bin is more conventional way to include it on tools like binman, pad_cat etc in future patches. Note: usage of platform type, boot stage doesn't follow consistent oder as of now. Signed-off-by: Jagan Teki --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d8a0f68883..b48693e560 100644 --- a/Makefile +++ b/Makefile @@ -909,7 +909,7 @@ ALL-y += u-boot-with-dtb.bin endif ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy) -ALL-y += idbloader.img +ALL-y += u-boot-spl-rockchip.bin endif LDFLAGS_u-boot += $(LDFLAGS_FINAL) @@ -1387,11 +1387,11 @@ ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy) MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE $(call if_changed,mkimage) -idbloader.img: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE +u-boot-spl-rockchip.bin: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE $(call if_changed,cat) else -MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) -idbloader.img: spl/u-boot-spl.bin FORCE +MKIMAGEFLAGS_u-boot-spl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) +u-boot-spl-rockchip.bin: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) endif @@ -1943,8 +1943,7 @@ CLEAN_DIRS += $(MODVERDIR) \ CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h tools/version.h \ boot* u-boot* MLO* SPL System.map fit-dtb.blob* \ u-boot-ivt.img.log u-boot-dtb.imx.log SPL.log u-boot.imx.log \ - lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* \ - idbloader.img + lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include/generated spl tpl \