From patchwork Mon Sep 19 10:46:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Chen X-Patchwork-Id: 671656 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sd2dL0pPrz9s2Q for ; Mon, 19 Sep 2016 20:47:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0E6A5A7577; Mon, 19 Sep 2016 12:46:56 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mPJ2fSUJQweM; Mon, 19 Sep 2016 12:46:55 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2A74F4BA5C; Mon, 19 Sep 2016 12:46:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A11904B77D for ; Mon, 19 Sep 2016 12:46:45 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YUkxz7dXojpf for ; Mon, 19 Sep 2016 12:46:45 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by theia.denx.de (Postfix) with ESMTPS id 1666B4B71E for ; Mon, 19 Sep 2016 12:46:41 +0200 (CEST) Received: by mail-pf0-f195.google.com with SMTP id 21so5687576pfy.1 for ; Mon, 19 Sep 2016 03:46:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=koiXcDVBN0T9iV5ADHz/8YJEZnkFGUs2glTKxJULlvU=; b=XE3nGbXvZ3b+cnWJZgSmo6djqrzxA4+oeroBD4KSZx/yWorsHfvkYXUg7mnOV4Mcny uUM5+6QMz0eIeT3Z4EUgxByZ0+Xcf3ZiUw5bdAhUiSdYkJZmDsdLAiO6OARFvkESA9fy 0X+FhKXdoaeFtmEXh8ZORLWWfx/fXb5k+jNPLksGR5gtz9qX9pcl5QqTCa/l4IOoOtbQ WNolJtH2cMAZkkJl40ulfPOiOZdRfSIeUKQWjuzsyVYZnidyNJsYmn2AZR9d3aoNFkGi cPeMVVkxN6RxABJZ3BmewyLIECiTtkrEBwulv6EQ4wGEc0+UN2MG5IOm1HGl5qMkpVTM m3RA== X-Gm-Message-State: AE9vXwMYunt0MZWiqYDRoDEmxejBeanePr6JHW+D5XBqHExxggdD+dYijtNOuU5PIwQnPA== X-Received: by 10.98.7.4 with SMTP id b4mr45785147pfd.136.1474282000091; Mon, 19 Sep 2016 03:46:40 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id j4sm56257125pfc.59.2016.09.19.03.46.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Sep 2016 03:46:39 -0700 (PDT) From: Jacob Chen To: u-boot@lists.denx.de Date: Mon, 19 Sep 2016 18:46:25 +0800 Message-Id: <1474281988-4654-2-git-send-email-jacob2.chen@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1474281988-4654-1-git-send-email-jacob2.chen@rock-chips.com> References: <1474281988-4654-1-git-send-email-jacob2.chen@rock-chips.com> Cc: huang lin , Jacob Chen Subject: [U-Boot] [PATCH 1/4] rockchip: move partitons define from 3036-kylin to 3036-common X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" To keep it same with 3288. Signed-off-by: Jacob Chen Acked-by: Simon Glass --- include/configs/kylin_rk3036.h | 24 ------------------------ include/configs/rk3036_common.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h index e8ca76d..39fb239 100644 --- a/include/configs/kylin_rk3036.h +++ b/include/configs/kylin_rk3036.h @@ -23,30 +23,6 @@ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -/* Enable gpt partition table */ -#define CONFIG_CMD_GPT -#define CONFIG_RANDOM_UUID -#define PARTS_DEFAULT \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=loader,start=32K,size=4000K,uuid=${uuid_gpt_loader};" \ - "name=reserved,size=64K,uuid=${uuid_gpt_reserved};" \ - "name=misc,size=4M,uuid=${uuid_gpt_misc};" \ - "name=recovery,size=32M,uuid=${uuid_gpt_recovery};" \ - "name=boot_a,size=32M,uuid=${uuid_gpt_boot_a};" \ - "name=boot_b,size=32M,uuid=${uuid_gpt_boot_b};" \ - "name=system_a,size=818M,uuid=${uuid_gpt_system_a};" \ - "name=system_b,size=818M,uuid=${uuid_gpt_system_b};" \ - "name=vendor_a,size=50M,uuid=${uuid_gpt_vendor_a};" \ - "name=vendor_b,size=50M,uuid=${uuid_gpt_vendor_b};" \ - "name=cache,size=100M,uuid=${uuid_gpt_cache};" \ - "name=metadata,size=16M,uuid=${uuid_gpt_metadata};" \ - "name=persist,size=4M,uuid=${uuid_gpt_persist};" \ - "name=userdata,size=-,uuid=${uuid_gpt_userdata};\0" \ - -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ - "partitions=" PARTS_DEFAULT \ - #endif #define CONFIG_BOARD_LATE_INIT diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 101a3ed..22fc55c 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -77,6 +77,9 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x2207 #define CONFIG_G_DNL_PRODUCT_NUM 0x310a +/* Enable gpt partition table */ +#define CONFIG_CMD_GPT + #include #define ENV_MEM_LAYOUT_SETTINGS \ @@ -86,6 +89,12 @@ "kernel_addr_r=0x62000000\0" \ "ramdisk_addr_r=0x64000000\0" +#define CONFIG_RANDOM_UUID +#define PARTS_DEFAULT \ + "uuid_disk=${uuid_gpt_disk};" \ + "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ + "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ + /* First try to boot from SD (index 0), then eMMC (index 1 */ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ @@ -97,6 +106,7 @@ * so limit the fdt reallocation to that */ #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0x7fffffff\0" \ + "partitions=" PARTS_DEFAULT \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV #endif