From patchwork Sun Nov 29 18:43:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Schuster X-Patchwork-Id: 549783 X-Patchwork-Delegate: trini@ti.com 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 B2FF7140273 for ; Mon, 30 Nov 2015 05:44:00 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b=KnQofDVN; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 88E6B4B712; Sun, 29 Nov 2015 19:43:58 +0100 (CET) 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 mQn7qA1xgdM9; Sun, 29 Nov 2015 19:43:58 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AE36F4B688; Sun, 29 Nov 2015 19:43:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 945054B688 for ; Sun, 29 Nov 2015 19:43:54 +0100 (CET) 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 dffN3q5c99jL for ; Sun, 29 Nov 2015 19:43:54 +0100 (CET) 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-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by theia.denx.de (Postfix) with ESMTPS id 1F6314B681 for ; Sun, 29 Nov 2015 19:43:50 +0100 (CET) Received: by padhx2 with SMTP id hx2so160636023pad.1 for ; Sun, 29 Nov 2015 10:43:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=uwzLuoRyLPYDYEjXb2Gp/OmzskNZ4X4YbQAEBWg0fT4=; b=KnQofDVNfFUAFpmRiyUV4s7XzUCJpcIkzp7Br8+ZrUi0FQbWQtbMGwdvi2NEgLPtkL cI3E62cvEAa38H7nRABhUZa8lh9cP6lACQM8VYvmy0DuySl3bRQWknT059rSnf9ivCyL gZ/pwmQR0ORVU1J9DE5VkYtQkbuBom2O8X5NcpKZABXFdsPwKHPwkIJFW8o9tbawR/cd GjQ1AllHqurWIbpmzZXoEZQ72m1fb1oVNkAmXI8CWZlkOPM+s0wuES3BfClYWG92Uwb8 yf+z3WtHSRqOLWY0qrLUJiZbAESE9HSDcv+A5rx4rNrLVsw7fuXVwcGSVn82G5c0c2lI AVXA== MIME-Version: 1.0 X-Received: by 10.66.150.37 with SMTP id uf5mr85725128pab.30.1448822628711; Sun, 29 Nov 2015 10:43:48 -0800 (PST) Received: by 10.66.149.137 with HTTP; Sun, 29 Nov 2015 10:43:48 -0800 (PST) Date: Sun, 29 Nov 2015 19:43:48 +0100 Message-ID: From: Marco Schuster To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/2] Remove fdtfile list from Raspberry Pi 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" As pass-through of the processed FDT is working now, there is no need for the RPi u-boot any more to load fdt files. This patch removes the fdtfile list and the setter for the env variable "fdtfile". This also removes the naming inconsistencies between the fdtfile names in u-boot and the fdtfile names in the official Raspberry Pi Firmware repository. --- board/raspberrypi/rpi/rpi.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) -- 2.6.2 diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index d8d0fbb..adba458 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -77,108 +77,84 @@ struct msg_get_clock_rate { /* See comments in mbox.h for data source */ static const struct { const char *name; - const char *fdtfile; bool has_onboard_eth; } models[] = { [0] = { "Unknown model", -#ifdef CONFIG_BCM2836 - "bcm2836-rpi-other.dtb", -#else - "bcm2835-rpi-other.dtb", -#endif false, }, #ifdef CONFIG_BCM2836 [BCM2836_BOARD_REV_2_B] = { "2 Model B", - "bcm2836-rpi-2-b.dtb", true, }, #else [BCM2835_BOARD_REV_B_I2C0_2] = { "Model B (no P5)", - "bcm2835-rpi-b-i2c0.dtb", true, }, [BCM2835_BOARD_REV_B_I2C0_3] = { "Model B (no P5)", - "bcm2835-rpi-b-i2c0.dtb", true, }, [BCM2835_BOARD_REV_B_I2C1_4] = { "Model B", - "bcm2835-rpi-b.dtb", true, }, [BCM2835_BOARD_REV_B_I2C1_5] = { "Model B", - "bcm2835-rpi-b.dtb", true, }, [BCM2835_BOARD_REV_B_I2C1_6] = { "Model B", - "bcm2835-rpi-b.dtb", true, }, [BCM2835_BOARD_REV_A_7] = { "Model A", - "bcm2835-rpi-a.dtb", false, }, [BCM2835_BOARD_REV_A_8] = { "Model A", - "bcm2835-rpi-a.dtb", false, }, [BCM2835_BOARD_REV_A_9] = { "Model A", - "bcm2835-rpi-a.dtb", false, }, [BCM2835_BOARD_REV_B_REV2_d] = { "Model B rev2", - "bcm2835-rpi-b-rev2.dtb", true, }, [BCM2835_BOARD_REV_B_REV2_e] = { "Model B rev2", - "bcm2835-rpi-b-rev2.dtb", true, }, [BCM2835_BOARD_REV_B_REV2_f] = { "Model B rev2", - "bcm2835-rpi-b-rev2.dtb", true, }, [BCM2835_BOARD_REV_B_PLUS] = { "Model B+", - "bcm2835-rpi-b-plus.dtb", true, }, [BCM2835_BOARD_REV_CM] = { "Compute Module", - "bcm2835-rpi-cm.dtb", false, }, [BCM2835_BOARD_REV_A_PLUS] = { "Model A+", - "bcm2835-rpi-a-plus.dtb", false, }, [BCM2835_BOARD_REV_B_PLUS_13] = { "Model B+", - "bcm2835-rpi-b-plus.dtb", true, }, [BCM2835_BOARD_REV_CM_14] = { "Compute Module", - "bcm2835-rpi-cm.dtb", false, }, [BCM2835_BOARD_REV_A_PLUS_15] = { "Model A+", - "bcm2835-rpi-a-plus.dtb", false, }, #endif @@ -205,17 +181,6 @@ int dram_init(void) return 0; } -static void set_fdtfile(void) -{ - const char *fdtfile; - - if (getenv("fdtfile")) - return; - - fdtfile = models[rpi_board_rev].fdtfile; - setenv("fdtfile", fdtfile); -} - static void set_usbethaddr(void) { ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_mac_address, msg, 1); @@ -254,7 +219,6 @@ static void set_board_info(void) int misc_init_r(void) { - set_fdtfile(); set_usbethaddr(); #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG set_board_info();