Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/113721/?format=api
{ "id": 113721, "url": "http://patchwork.ozlabs.org/api/patches/113721/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1315383384-29332-1-git-send-email-aneesh@ti.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1315383384-29332-1-git-send-email-aneesh@ti.com>", "list_archive_url": null, "date": "2011-09-07T08:16:22", "name": "[U-Boot,v3,1/3] omap4: factor out common part from board config headers", "commit_ref": "16dc702f2419d1bd5b829a60382785c22d9ee50c", "pull_url": null, "state": "accepted", "archived": false, "hash": "47d41095dc692badd700f0263551ca1a219675e1", "submitter": { "id": 6298, "url": "http://patchwork.ozlabs.org/api/people/6298/?format=api", "name": "Aneesh V", "email": "aneesh@ti.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/1315383384-29332-1-git-send-email-aneesh@ti.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/113721/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/113721/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "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])\n\tby ozlabs.org (Postfix) with ESMTP id BE339B6F7E\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 7 Sep 2011 18:18:47 +1000 (EST)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id A4A202809E;\n\tWed, 7 Sep 2011 10:18:29 +0200 (CEST)", "from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 7jMvQ+bQkT8s; Wed, 7 Sep 2011 10:18:29 +0200 (CEST)", "from theia.denx.de (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id DFE6E2809F;\n\tWed, 7 Sep 2011 10:18:15 +0200 (CEST)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 8011728090\n\tfor <u-boot@lists.denx.de>; Wed, 7 Sep 2011 10:18:12 +0200 (CEST)", "from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id eHmnUXMKTI12 for <u-boot@lists.denx.de>;\n\tWed, 7 Sep 2011 10:18:10 +0200 (CEST)", "from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41])\n\tby theia.denx.de (Postfix) with ESMTPS id 63E7028087\n\tfor <u-boot@lists.denx.de>; Wed, 7 Sep 2011 10:18:06 +0200 (CEST)", "from dbdp20.itg.ti.com ([172.24.170.38])\n\tby bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p878I1KX007462\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)\n\tfor <u-boot@lists.denx.de>; Wed, 7 Sep 2011 03:18:04 -0500", "from dbde70.ent.ti.com (localhost [127.0.0.1])\n\tby dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p878I0Nu002032\n\tfor <u-boot@lists.denx.de>; Wed, 7 Sep 2011 13:48:01 +0530 (IST)", "from dbdp31.itg.ti.com (172.24.170.98) by DBDE70.ent.ti.com\n\t(172.24.170.148) with Microsoft SMTP Server id 8.3.106.1;\n\tWed, 7 Sep 2011 13:48:00 +0530", "from localhost (a0393566pc.apr.dhcp.ti.com [172.24.137.55])\tby\n\tdbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p878Hxbl016370;\n\tWed, 7 Sep 2011 13:47:59 +0530 (IST)" ], "X-Virus-Scanned": [ "Debian amavisd-new at theia.denx.de", "Debian amavisd-new at theia.denx.de" ], "X-policyd-weight": "NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5\n\tNOT_IN_BL_NJABL=-1.5 (only DNSBL check requested)", "From": "Aneesh V <aneesh@ti.com>", "To": "<u-boot@lists.denx.de>", "Date": "Wed, 7 Sep 2011 13:46:22 +0530", "Message-ID": "<1315383384-29332-1-git-send-email-aneesh@ti.com>", "X-Mailer": "git-send-email 1.7.0.4", "In-Reply-To": "<1312893821-29250-1-git-send-email-aneesh@ti.com>", "References": "<1312893821-29250-1-git-send-email-aneesh@ti.com>", "MIME-Version": "1.0", "Cc": "santosh.shilimkar@ti.com", "Subject": "[U-Boot] [PATCH v3 1/3] omap4: factor out common part from board\n\tconfig headers", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.9", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<http://lists.denx.de/mailman/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<http://lists.denx.de/mailman/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "u-boot-bounces@lists.denx.de", "Errors-To": "u-boot-bounces@lists.denx.de" }, "content": "Factor out common parts from omap4_sdp4430.h and omap4_panda.h\ninto a new file omap4_common.h\n\nSigned-off-by: Aneesh V <aneesh@ti.com>\n---\nV2:\n* Rebased on latest HEAD of u-boot-ti master\n\nV3:\n* Fixed checkpatch error\n---\n include/configs/omap4_common.h | 275 +++++++++++++++++++++++++++++++++++++++\n include/configs/omap4_panda.h | 244 +---------------------------------\n include/configs/omap4_sdp4430.h | 245 +---------------------------------\n 3 files changed, 288 insertions(+), 476 deletions(-)\n create mode 100644 include/configs/omap4_common.h", "diff": "diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h\nnew file mode 100644\nindex 0000000..d8ac8c0\n--- /dev/null\n+++ b/include/configs/omap4_common.h\n@@ -0,0 +1,275 @@\n+/*\n+ * (C) Copyright 2010\n+ * Texas Instruments Incorporated.\n+ * Aneesh V <aneesh@ti.com>\n+ * Steve Sakoman <steve@sakoman.com>\n+ *\n+ * TI OMAP4 common configuration settings\n+ *\n+ * See file CREDITS for list of people who contributed to this\n+ * project.\n+ *\n+ * This program is free software; you can redistribute it and/or\n+ * modify it under the terms of the GNU General Public License as\n+ * published by the Free Software Foundation; either version 2 of\n+ * the License, or (at your option) any later version.\n+ *\n+ * This program is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ * GNU General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU General Public License\n+ * along with this program; if not, write to the Free Software\n+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n+ * MA 02111-1307 USA\n+ */\n+\n+#ifndef __CONFIG_OMAP4_COMMON_H\n+#define __CONFIG_OMAP4_COMMON_H\n+\n+/*\n+ * High Level Configuration Options\n+ */\n+#define CONFIG_ARMV7\t\t1\t/* This is an ARM V7 CPU core */\n+#define CONFIG_OMAP\t\t1\t/* in a TI OMAP core */\n+#define CONFIG_OMAP44XX\t\t1\t/* which is a 44XX */\n+#define CONFIG_OMAP4430\t\t1\t/* which is in a 4430 */\n+#define CONFIG_ARCH_CPU_INIT\n+\n+/* Get CPU defs */\n+#include <asm/arch/cpu.h>\n+#include <asm/arch/omap4.h>\n+\n+/* Display CPU and Board Info */\n+#define CONFIG_DISPLAY_CPUINFO\t\t1\n+#define CONFIG_DISPLAY_BOARDINFO\t1\n+\n+/* Clock Defines */\n+#define V_OSCK\t\t\t38400000\t/* Clock output from T2 */\n+#define V_SCLK V_OSCK\n+\n+#undef CONFIG_USE_IRQ\t\t\t\t/* no support for IRQs */\n+#define CONFIG_MISC_INIT_R\n+\n+#define CONFIG_OF_LIBFDT\t\t1\n+\n+#define CONFIG_CMDLINE_TAG\t\t1\t/* enable passing of ATAGs */\n+#define CONFIG_SETUP_MEMORY_TAGS\t1\n+#define CONFIG_INITRD_TAG\t\t1\n+#define CONFIG_REVISION_TAG\t\t1\n+\n+/*\n+ * Size of malloc() pool\n+ * Total Size Environment - 128k\n+ * Malloc - add 256k\n+ */\n+#define CONFIG_ENV_SIZE\t\t\t(128 << 10)\n+#define CONFIG_SYS_MALLOC_LEN\t\t(CONFIG_ENV_SIZE + (256 << 10))\n+/* Vector Base */\n+#define CONFIG_SYS_CA9_VECTOR_BASE\tSRAM_ROM_VECT_BASE\n+\n+/*\n+ * Hardware drivers\n+ */\n+\n+/*\n+ * serial port - NS16550 compatible\n+ */\n+#define V_NS16550_CLK\t\t\t48000000\n+\n+#define CONFIG_SYS_NS16550\n+#define CONFIG_SYS_NS16550_SERIAL\n+#define CONFIG_SYS_NS16550_REG_SIZE\t(-4)\n+#define CONFIG_SYS_NS16550_CLK\t\tV_NS16550_CLK\n+#define CONFIG_CONS_INDEX\t\t3\n+#define CONFIG_SYS_NS16550_COM3\t\tUART3_BASE\n+\n+#define CONFIG_BAUDRATE\t\t\t115200\n+#define CONFIG_SYS_BAUDRATE_TABLE\t{4800, 9600, 19200, 38400, 57600,\\\n+\t\t\t\t\t115200}\n+/* I2C */\n+#define CONFIG_HARD_I2C\t\t\t1\n+#define CONFIG_SYS_I2C_SPEED\t\t100000\n+#define CONFIG_SYS_I2C_SLAVE\t\t1\n+#define CONFIG_SYS_I2C_BUS\t\t0\n+#define CONFIG_SYS_I2C_BUS_SELECT\t1\n+#define CONFIG_DRIVER_OMAP34XX_I2C\t1\n+#define CONFIG_I2C_MULTI_BUS\t\t1\n+\n+/* TWL6030 */\n+#define CONFIG_TWL6030_POWER\t\t1\n+\n+/* MMC */\n+#define CONFIG_GENERIC_MMC\t\t1\n+#define CONFIG_MMC\t\t\t1\n+#define CONFIG_OMAP_HSMMC\t\t1\n+#define CONFIG_SYS_MMC_SET_DEV\t\t1\n+#define CONFIG_DOS_PARTITION\t\t1\n+\n+\n+/* USB */\n+#define CONFIG_MUSB_UDC\t\t\t1\n+#define CONFIG_USB_OMAP3\t\t1\n+\n+/* USB device configuration */\n+#define CONFIG_USB_DEVICE\t\t1\n+#define CONFIG_USB_TTY\t\t\t1\n+#define CONFIG_SYS_CONSOLE_IS_IN_ENV\t1\n+\n+/* Flash */\n+#define CONFIG_SYS_NO_FLASH\t1\n+\n+/* commands to include */\n+#include <config_cmd_default.h>\n+\n+/* Enabled commands */\n+#define CONFIG_CMD_EXT2\t\t/* EXT2 Support */\n+#define CONFIG_CMD_FAT\t\t/* FAT support */\n+#define CONFIG_CMD_I2C\t\t/* I2C serial bus support\t*/\n+#define CONFIG_CMD_MMC\t\t/* MMC support */\n+\n+/* Disabled commands */\n+#undef CONFIG_CMD_NET\n+#undef CONFIG_CMD_NFS\n+#undef CONFIG_CMD_FPGA\t\t/* FPGA configuration Support */\n+#undef CONFIG_CMD_IMLS\t\t/* List all found images */\n+\n+/*\n+ * Environment setup\n+ */\n+\n+#define CONFIG_BOOTDELAY\t3\n+\n+#define CONFIG_ENV_OVERWRITE\n+\n+#define CONFIG_EXTRA_ENV_SETTINGS \\\n+\t\"loadaddr=0x82000000\\0\" \\\n+\t\"console=ttyS2,115200n8\\0\" \\\n+\t\"usbtty=cdc_acm\\0\" \\\n+\t\"vram=16M\\0\" \\\n+\t\"mmcdev=0\\0\" \\\n+\t\"mmcroot=/dev/mmcblk0p2 rw\\0\" \\\n+\t\"mmcrootfstype=ext3 rootwait\\0\" \\\n+\t\"mmcargs=setenv bootargs console=${console} \" \\\n+\t\t\"vram=${vram} \" \\\n+\t\t\"root=${mmcroot} \" \\\n+\t\t\"rootfstype=${mmcrootfstype}\\0\" \\\n+\t\"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\\0\" \\\n+\t\"bootscript=echo Running bootscript from mmc${mmcdev} ...; \" \\\n+\t\t\"source ${loadaddr}\\0\" \\\n+\t\"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\\0\" \\\n+\t\"mmcboot=echo Booting from mmc${mmcdev} ...; \" \\\n+\t\t\"run mmcargs; \" \\\n+\t\t\"bootm ${loadaddr}\\0\" \\\n+\n+#define CONFIG_BOOTCOMMAND \\\n+\t\"if mmc rescan ${mmcdev}; then \" \\\n+\t\t\"if run loadbootscript; then \" \\\n+\t\t\t\"run bootscript; \" \\\n+\t\t\"else \" \\\n+\t\t\t\"if run loaduimage; then \" \\\n+\t\t\t\t\"run mmcboot; \" \\\n+\t\t\t\"fi; \" \\\n+\t\t\"fi; \" \\\n+\t\"fi\"\n+\n+#define CONFIG_AUTO_COMPLETE\t\t1\n+\n+/*\n+ * Miscellaneous configurable options\n+ */\n+\n+#define CONFIG_SYS_LONGHELP\t/* undef to save memory */\n+#define CONFIG_SYS_HUSH_PARSER\t/* use \"hush\" command parser */\n+#define CONFIG_SYS_PROMPT_HUSH_PS2\t\"> \"\n+#define CONFIG_SYS_CBSIZE\t\t512\n+/* Print Buffer Size */\n+#define CONFIG_SYS_PBSIZE\t\t(CONFIG_SYS_CBSIZE + \\\n+\t\t\t\t\tsizeof(CONFIG_SYS_PROMPT) + 16)\n+#define CONFIG_SYS_MAXARGS\t\t16\n+/* Boot Argument Buffer Size */\n+#define CONFIG_SYS_BARGSIZE\t\t(CONFIG_SYS_CBSIZE)\n+\n+/*\n+ * memtest setup\n+ */\n+#define CONFIG_SYS_MEMTEST_START\t0x80000000\n+#define CONFIG_SYS_MEMTEST_END\t\t(CONFIG_SYS_MEMTEST_START + (32 << 20))\n+\n+/* Default load address */\n+#define CONFIG_SYS_LOAD_ADDR\t\t0x80000000\n+\n+/* Use General purpose timer 1 */\n+#define CONFIG_SYS_TIMERBASE\t\tGPT2_BASE\n+#define CONFIG_SYS_PTV\t\t\t2\t/* Divisor: 2^(PTV+1) => 8 */\n+#define CONFIG_SYS_HZ\t\t\t1000\n+\n+/*\n+ * Stack sizes\n+ *\n+ * The stack sizes are set up in start.S using the settings below\n+ */\n+#define CONFIG_STACKSIZE\t(128 << 10)\t/* Regular stack */\n+#ifdef CONFIG_USE_IRQ\n+#define CONFIG_STACKSIZE_IRQ\t(4 << 10)\t/* IRQ stack */\n+#define CONFIG_STACKSIZE_FIQ\t(4 << 10)\t/* FIQ stack */\n+#endif\n+\n+/*\n+ * SDRAM Memory Map\n+ * Even though we use two CS all the memory\n+ * is mapped to one contiguous block\n+ */\n+#define CONFIG_NR_DRAM_BANKS\t1\n+\n+#define CONFIG_SYS_SDRAM_BASE\t\t0x80000000\n+#define CONFIG_SYS_INIT_RAM_ADDR\t0x4030D800\n+#define CONFIG_SYS_INIT_RAM_SIZE\t0x800\n+#define CONFIG_SYS_INIT_SP_ADDR\t\t(CONFIG_SYS_INIT_RAM_ADDR + \\\n+\t\t\t\t\t CONFIG_SYS_INIT_RAM_SIZE - \\\n+\t\t\t\t\t GENERATED_GBL_DATA_SIZE)\n+\n+#ifndef CONFIG_SYS_L2CACHE_OFF\n+#define CONFIG_SYS_L2_PL310\t\t1\n+#define CONFIG_SYS_PL310_BASE\t0x48242000\n+#endif\n+\n+/* Defines for SDRAM init */\n+#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS\n+#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION\n+#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS\n+#endif\n+\n+/* Defines for SPL */\n+#define CONFIG_SPL\n+#define CONFIG_SPL_TEXT_BASE\t\t0x40304350\n+#define CONFIG_SPL_MAX_SIZE\t\t(38 * 1024)\n+#define CONFIG_SPL_STACK\t\tLOW_LEVEL_SRAM_STACK\n+\n+#define CONFIG_SPL_BSS_START_ADDR\t0x80000000\n+#define CONFIG_SPL_BSS_MAX_SIZE\t\t0x80000\t\t/* 512 KB */\n+\n+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR\t0x300 /* address 0x60000 */\n+#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS\t0x200 /* 256 KB */\n+#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION\t1\n+#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME\t\"u-boot.img\"\n+\n+#define CONFIG_SPL_LIBCOMMON_SUPPORT\n+#define CONFIG_SPL_LIBDISK_SUPPORT\n+#define CONFIG_SPL_I2C_SUPPORT\n+#define CONFIG_SPL_MMC_SUPPORT\n+#define CONFIG_SPL_FAT_SUPPORT\n+#define CONFIG_SPL_LIBGENERIC_SUPPORT\n+#define CONFIG_SPL_SERIAL_SUPPORT\n+#define CONFIG_SPL_LDSCRIPT \"arch/arm/cpu/armv7/omap-common/u-boot-spl.lds\"\n+\n+/*\n+ * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM\n+ * 64 bytes before this address should be set aside for u-boot.img's\n+ * header. That is 0x800FFFC0--0x80100000 should not be used for any\n+ * other needs.\n+ */\n+#define CONFIG_SYS_TEXT_BASE\t\t0x80100000\n+\n+#endif /* __CONFIG_OMAP4_COMMON_H */\ndiff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h\nindex 6faf0e2..4fcd725 100644\n--- a/include/configs/omap4_panda.h\n+++ b/include/configs/omap4_panda.h\n@@ -4,6 +4,7 @@\n * Steve Sakoman <steve@sakoman.com>\n *\n * Configuration settings for the TI OMAP4 Panda board.\n+ * See omap4_common.h for OMAP4 common part\n *\n * See file CREDITS for list of people who contributed to this\n * project.\n@@ -24,253 +25,20 @@\n * MA 02111-1307 USA\n */\n \n-#ifndef __CONFIG_H\n-#define __CONFIG_H\n+#ifndef __CONFIG_PANDA_H\n+#define __CONFIG_PANDA_H\n \n /*\n * High Level Configuration Options\n */\n-#define CONFIG_OMAP\t\t1\t/* in a TI OMAP core */\n-#define CONFIG_OMAP44XX\t\t1\t/* which is a 44XX */\n-#define CONFIG_OMAP4430\t\t1\t/* which is in a 4430 */\n #define CONFIG_PANDA\t\t1\t/* working with Panda */\n-#define CONFIG_ARCH_CPU_INIT\n \n-/* Get CPU defs */\n-#include <asm/arch/cpu.h>\n-#include <asm/arch/omap4.h>\n-\n-/* Display CPU and Board Info */\n-#define CONFIG_DISPLAY_CPUINFO\t\t1\n-#define CONFIG_DISPLAY_BOARDINFO\t1\n-\n-/* Clock Defines */\n-#define V_OSCK\t\t\t38400000\t/* Clock output from T2 */\n-#define V_SCLK V_OSCK\n-\n-#undef CONFIG_USE_IRQ\t\t\t\t/* no support for IRQs */\n-#define CONFIG_MISC_INIT_R\n-\n-#define CONFIG_CMDLINE_TAG\t\t1\t/* enable passing of ATAGs */\n-#define CONFIG_SETUP_MEMORY_TAGS\t1\n-#define CONFIG_INITRD_TAG\t\t1\n-#define CONFIG_REVISION_TAG\t\t1\n-\n-#define CONFIG_OF_LIBFDT\t\t1\n-\n-/*\n- * Size of malloc() pool\n- * Total Size Environment - 256k\n- * Malloc - add 256k\n- */\n-#define CONFIG_ENV_SIZE\t\t\t(256 << 10)\n-#define CONFIG_SYS_MALLOC_LEN\t\t(CONFIG_ENV_SIZE + (256 << 10))\n-/* Vector Base */\n-#define CONFIG_SYS_CA9_VECTOR_BASE\tSRAM_ROM_VECT_BASE\n-\n-/*\n- * Hardware drivers\n- */\n-\n-/*\n- * serial port - NS16550 compatible\n- */\n-#define V_NS16550_CLK\t\t\t48000000\n-\n-#define CONFIG_SYS_NS16550\n-#define CONFIG_SYS_NS16550_SERIAL\n-#define CONFIG_SYS_NS16550_REG_SIZE\t(-4)\n-#define CONFIG_SYS_NS16550_CLK\t\tV_NS16550_CLK\n-#define CONFIG_CONS_INDEX\t\t3\n-#define CONFIG_SYS_NS16550_COM3\t\tUART3_BASE\n+#include <configs/omap4_common.h>\n \n+/* ENV related config options */\n #define CONFIG_ENV_IS_NOWHERE\n-#define CONFIG_BAUDRATE\t\t\t115200\n-#define CONFIG_SYS_BAUDRATE_TABLE\t{4800, 9600, 19200, 38400, 57600,\\\n-\t\t\t\t\t115200}\n-\n-/* I2C */\n-#define CONFIG_HARD_I2C\t\t\t1\n-#define CONFIG_SYS_I2C_SPEED\t\t100000\n-#define CONFIG_SYS_I2C_SLAVE\t\t1\n-#define CONFIG_SYS_I2C_BUS\t\t0\n-#define CONFIG_SYS_I2C_BUS_SELECT\t1\n-#define CONFIG_DRIVER_OMAP34XX_I2C\t1\n-#define CONFIG_I2C_MULTI_BUS\t\t1\n-\n-/* TWL6030 */\n-#define CONFIG_TWL6030_POWER\t\t1\n-\n-/* MMC */\n-#define CONFIG_GENERIC_MMC\t\t1\n-#define CONFIG_MMC\t\t\t1\n-#define CONFIG_OMAP_HSMMC\t\t1\n-#define CONFIG_SYS_MMC_SET_DEV\t\t1\n-#define CONFIG_DOS_PARTITION\t\t1\n-\n-/* USB */\n-#define CONFIG_MUSB_UDC\t\t\t1\n-#define CONFIG_USB_OMAP3\t\t1\n-\n-/* USB device configuration */\n-#define CONFIG_USB_DEVICE\t\t1\n-#define CONFIG_USB_TTY\t\t\t1\n-#define CONFIG_SYS_CONSOLE_IS_IN_ENV\t1\n-\n-/* Flash */\n-#define CONFIG_SYS_NO_FLASH\t1\n-\n-/* commands to include */\n-#include <config_cmd_default.h>\n-\n-/* Enabled commands */\n-#define CONFIG_CMD_EXT2\t\t/* EXT2 Support */\n-#define CONFIG_CMD_FAT\t\t/* FAT support */\n-#define CONFIG_CMD_I2C\t\t/* I2C serial bus support\t*/\n-#define CONFIG_CMD_MMC\t\t/* MMC support */\n-\n-/* Disabled commands */\n-#undef CONFIG_CMD_NET\n-#undef CONFIG_CMD_NFS\n-#undef CONFIG_CMD_FPGA\t\t/* FPGA configuration Support */\n-#undef CONFIG_CMD_IMLS\t\t/* List all found images */\n-\n-/*\n- * Environment setup\n- */\n-\n-#define CONFIG_BOOTDELAY\t3\n \n-#define CONFIG_ENV_OVERWRITE\n-\n-#define CONFIG_EXTRA_ENV_SETTINGS \\\n-\t\"loadaddr=0x82000000\\0\" \\\n-\t\"console=ttyS2,115200n8\\0\" \\\n-\t\"usbtty=cdc_acm\\0\" \\\n-\t\"vram=16M\\0\" \\\n-\t\"mmcdev=0\\0\" \\\n-\t\"mmcroot=/dev/mmcblk0p2 rw\\0\" \\\n-\t\"mmcrootfstype=ext3 rootwait\\0\" \\\n-\t\"mmcargs=setenv bootargs console=${console} \" \\\n-\t\t\"vram=${vram} \" \\\n-\t\t\"root=${mmcroot} \" \\\n-\t\t\"rootfstype=${mmcrootfstype}\\0\" \\\n-\t\"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\\0\" \\\n-\t\"bootscript=echo Running bootscript from mmc${mmcdev} ...; \" \\\n-\t\t\"source ${loadaddr}\\0\" \\\n-\t\"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\\0\" \\\n-\t\"mmcboot=echo Booting from mmc${mmcdev} ...; \" \\\n-\t\t\"run mmcargs; \" \\\n-\t\t\"bootm ${loadaddr}\\0\" \\\n-\n-#define CONFIG_BOOTCOMMAND \\\n-\t\"if mmc rescan ${mmcdev}; then \" \\\n-\t\t\"if run loadbootscript; then \" \\\n-\t\t\t\"run bootscript; \" \\\n-\t\t\"else \" \\\n-\t\t\t\"if run loaduimage; then \" \\\n-\t\t\t\t\"run mmcboot; \" \\\n-\t\t\t\"fi; \" \\\n-\t\t\"fi; \" \\\n-\t\"fi\"\n-\n-#define CONFIG_AUTO_COMPLETE\t\t1\n-\n-/*\n- * Miscellaneous configurable options\n- */\n-\n-#define CONFIG_SYS_LONGHELP\t/* undef to save memory */\n-#define CONFIG_SYS_HUSH_PARSER\t/* use \"hush\" command parser */\n-#define CONFIG_SYS_PROMPT_HUSH_PS2\t\"> \"\n #define CONFIG_SYS_PROMPT\t\t\"Panda # \"\n-#define CONFIG_SYS_CBSIZE\t\t512\n-/* Print Buffer Size */\n-#define CONFIG_SYS_PBSIZE\t\t(CONFIG_SYS_CBSIZE + \\\n-\t\t\t\t\tsizeof(CONFIG_SYS_PROMPT) + 16)\n-#define CONFIG_SYS_MAXARGS\t\t16\n-/* Boot Argument Buffer Size */\n-#define CONFIG_SYS_BARGSIZE\t\t(CONFIG_SYS_CBSIZE)\n-\n-/*\n- * memtest setup\n- */\n-#define CONFIG_SYS_MEMTEST_START\t0x80000000\n-#define CONFIG_SYS_MEMTEST_END\t\t(CONFIG_SYS_MEMTEST_START + (32 << 20))\n-\n-/* Default load address */\n-#define CONFIG_SYS_LOAD_ADDR\t\t0x80000000\n-\n-/* Use General purpose timer 1 */\n-#define CONFIG_SYS_TIMERBASE\t\tGPT2_BASE\n-#define CONFIG_SYS_PTV\t\t\t2\t/* Divisor: 2^(PTV+1) => 8 */\n-#define CONFIG_SYS_HZ\t\t\t1000\n-\n-/*\n- * Stack sizes\n- *\n- * The stack sizes are set up in start.S using the settings below\n- */\n-#define CONFIG_STACKSIZE\t(128 << 10)\t/* Regular stack */\n-#ifdef CONFIG_USE_IRQ\n-#define CONFIG_STACKSIZE_IRQ\t(4 << 10)\t/* IRQ stack */\n-#define CONFIG_STACKSIZE_FIQ\t(4 << 10)\t/* FIQ stack */\n-#endif\n-\n-/*\n- * SDRAM Memory Map\n- * Even though we use two CS all the memory\n- * is mapped to one contiguous block\n- */\n-#define CONFIG_NR_DRAM_BANKS\t1\n-\n-#define CONFIG_SYS_SDRAM_BASE\t\t0x80000000\n-#define CONFIG_SYS_INIT_RAM_ADDR\t0x4030D800\n-#define CONFIG_SYS_INIT_RAM_SIZE\t0x800\n-#define CONFIG_SYS_INIT_SP_ADDR\t\t(CONFIG_SYS_INIT_RAM_ADDR + \\\n-\t\t\t\t\t CONFIG_SYS_INIT_RAM_SIZE - \\\n-\t\t\t\t\t GENERATED_GBL_DATA_SIZE)\n-\n-#ifndef CONFIG_SYS_L2CACHE_OFF\n-#define CONFIG_SYS_L2_PL310\t\t1\n-#define CONFIG_SYS_PL310_BASE\t0x48242000\n-#endif\n \n-/* Defines for SDRAM init */\n-#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS\n-#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION\n-#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS\n-#endif\n-\n-/* Defines for SPL */\n-#define CONFIG_SPL\n-#define CONFIG_SPL_TEXT_BASE\t\t0x40304350\n-#define CONFIG_SPL_MAX_SIZE\t\t(38 * 1024)\n-#define CONFIG_SPL_STACK\t\tLOW_LEVEL_SRAM_STACK\n-\n-#define CONFIG_SPL_BSS_START_ADDR\t0x80000000\n-#define CONFIG_SPL_BSS_MAX_SIZE\t\t0x80000\t\t/* 512 KB */\n-\n-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR\t0x300 /* address 0x60000 */\n-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS\t0x200 /* 256 KB */\n-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION\t1\n-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME\t\"u-boot.img\"\n-\n-#define CONFIG_SPL_LIBCOMMON_SUPPORT\n-#define CONFIG_SPL_LIBDISK_SUPPORT\n-#define CONFIG_SPL_I2C_SUPPORT\n-#define CONFIG_SPL_MMC_SUPPORT\n-#define CONFIG_SPL_FAT_SUPPORT\n-#define CONFIG_SPL_LIBGENERIC_SUPPORT\n-#define CONFIG_SPL_SERIAL_SUPPORT\n-#define CONFIG_SPL_LDSCRIPT \"arch/arm/cpu/armv7/omap-common/u-boot-spl.lds\"\n-\n-/*\n- * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM\n- * 64 bytes before this address should be set aside for u-boot.img's\n- * header. That is 0x800FFFC0--0x80100000 should not be used for any\n- * other needs.\n- */\n-#define CONFIG_SYS_TEXT_BASE\t\t0x80100000\n+#endif /* __CONFIG_PANDA_H */\n \n-#endif /* __CONFIG_H */\ndiff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h\nindex ba6f49d..0a9b707 100644\n--- a/include/configs/omap4_sdp4430.h\n+++ b/include/configs/omap4_sdp4430.h\n@@ -5,6 +5,7 @@\n * Steve Sakoman <steve@sakoman.com>\n *\n * Configuration settings for the TI SDP4430 board.\n+ * See omap4_common.h for OMAP4 common part\n *\n * See file CREDITS for list of people who contributed to this\n * project.\n@@ -25,258 +26,26 @@\n * MA 02111-1307 USA\n */\n \n-#ifndef __CONFIG_H\n-#define __CONFIG_H\n+#ifndef __CONFIG_SDP4430_H\n+#define __CONFIG_SDP4430_H\n \n /*\n * High Level Configuration Options\n */\n-#define CONFIG_OMAP\t\t1\t/* in a TI OMAP core */\n-#define CONFIG_OMAP44XX\t\t1\t/* which is a 44XX */\n-#define CONFIG_OMAP4430\t\t1\t/* which is in a 4430 */\n #define CONFIG_4430SDP\t\t1\t/* working with SDP */\n-#define CONFIG_ARCH_CPU_INIT\n \n-/* Get CPU defs */\n-#include <asm/arch/cpu.h>\n-#include <asm/arch/omap4.h>\n+#include <configs/omap4_common.h>\n \n-/* Display CPU and Board Info */\n-#define CONFIG_DISPLAY_CPUINFO\t\t1\n-#define CONFIG_DISPLAY_BOARDINFO\t1\n-\n-/* Clock Defines */\n-#define V_OSCK\t\t\t38400000\t/* Clock output from T2 */\n-#define V_SCLK V_OSCK\n-\n-#undef CONFIG_USE_IRQ\t\t\t\t/* no support for IRQs */\n-#define CONFIG_MISC_INIT_R\n-\n-#define CONFIG_OF_LIBFDT\t\t1\n-\n-#define CONFIG_CMDLINE_TAG\t\t1\t/* enable passing of ATAGs */\n-#define CONFIG_SETUP_MEMORY_TAGS\t1\n-#define CONFIG_INITRD_TAG\t\t1\n-#define CONFIG_REVISION_TAG\t\t1\n-\n-/*\n- * Size of malloc() pool\n- * Total Size Environment - 128k\n- * Malloc - add 256k\n- */\n-#define CONFIG_ENV_SIZE\t\t\t(128 << 10)\n-#define CONFIG_SYS_MALLOC_LEN\t\t(CONFIG_ENV_SIZE + (256 << 10))\n-/* Vector Base */\n-#define CONFIG_SYS_CA9_VECTOR_BASE\tSRAM_ROM_VECT_BASE\n-\n-/*\n- * Hardware drivers\n- */\n-\n-/*\n- * serial port - NS16550 compatible\n- */\n-#define V_NS16550_CLK\t\t\t48000000\n-\n-#define CONFIG_SYS_NS16550\n-#define CONFIG_SYS_NS16550_SERIAL\n-#define CONFIG_SYS_NS16550_REG_SIZE\t(-4)\n-#define CONFIG_SYS_NS16550_CLK\t\tV_NS16550_CLK\n-#define CONFIG_CONS_INDEX\t\t3\n-#define CONFIG_SYS_NS16550_COM3\t\tUART3_BASE\n-\n-#define CONFIG_BAUDRATE\t\t\t115200\n-#define CONFIG_SYS_BAUDRATE_TABLE\t{4800, 9600, 19200, 38400, 57600,\\\n-\t\t\t\t\t115200}\n-/* I2C */\n-#define CONFIG_HARD_I2C\t\t\t1\n-#define CONFIG_SYS_I2C_SPEED\t\t100000\n-#define CONFIG_SYS_I2C_SLAVE\t\t1\n-#define CONFIG_SYS_I2C_BUS\t\t0\n-#define CONFIG_SYS_I2C_BUS_SELECT\t1\n-#define CONFIG_DRIVER_OMAP34XX_I2C\t1\n-#define CONFIG_I2C_MULTI_BUS\t\t1\n-\n-/* TWL6030 */\n-#define CONFIG_TWL6030_POWER\t\t1\n+/* Battery Charger */\n #define CONFIG_CMD_BAT\t\t\t1\n \n-/* MMC */\n-#define CONFIG_GENERIC_MMC\t\t1\n-#define CONFIG_MMC\t\t\t1\n-#define CONFIG_OMAP_HSMMC\t\t1\n-#define CONFIG_SYS_MMC_SET_DEV\t\t1\n-#define CONFIG_DOS_PARTITION\t\t1\n-\n-/* MMC ENV related defines */\n+/* ENV related config options */\n #define CONFIG_ENV_IS_IN_MMC\t\t1\n #define CONFIG_SYS_MMC_ENV_DEV\t\t1\t/* SLOT2: eMMC(1) */\n #define CONFIG_ENV_OFFSET\t\t0xE0000\n-\n-/* USB */\n-#define CONFIG_MUSB_UDC\t\t\t1\n-#define CONFIG_USB_OMAP3\t\t1\n-\n-/* USB device configuration */\n-#define CONFIG_USB_DEVICE\t\t1\n-#define CONFIG_USB_TTY\t\t\t1\n-#define CONFIG_SYS_CONSOLE_IS_IN_ENV\t1\n-\n-/* Flash */\n-#define CONFIG_SYS_NO_FLASH\t1\n-\n-/* commands to include */\n-#include <config_cmd_default.h>\n-\n-/* Enabled commands */\n-#define CONFIG_CMD_EXT2\t\t/* EXT2 Support */\n-#define CONFIG_CMD_FAT\t\t/* FAT support */\n-#define CONFIG_CMD_I2C\t\t/* I2C serial bus support\t*/\n-#define CONFIG_CMD_MMC\t\t/* MMC support */\n #define CONFIG_CMD_SAVEENV\n \n-/* Disabled commands */\n-#undef CONFIG_CMD_NET\n-#undef CONFIG_CMD_NFS\n-#undef CONFIG_CMD_FPGA\t\t/* FPGA configuration Support */\n-#undef CONFIG_CMD_IMLS\t\t/* List all found images */\n-\n-/*\n- * Environment setup\n- */\n-\n-#define CONFIG_BOOTDELAY\t3\n-\n-#define CONFIG_ENV_OVERWRITE\n-\n-#define CONFIG_EXTRA_ENV_SETTINGS \\\n-\t\"loadaddr=0x82000000\\0\" \\\n-\t\"console=ttyS2,115200n8\\0\" \\\n-\t\"usbtty=cdc_acm\\0\" \\\n-\t\"vram=16M\\0\" \\\n-\t\"mmcdev=0\\0\" \\\n-\t\"mmcroot=/dev/mmcblk0p2 rw\\0\" \\\n-\t\"mmcrootfstype=ext3 rootwait\\0\" \\\n-\t\"mmcargs=setenv bootargs console=${console} \" \\\n-\t\t\"vram=${vram} \" \\\n-\t\t\"root=${mmcroot} \" \\\n-\t\t\"rootfstype=${mmcrootfstype}\\0\" \\\n-\t\"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\\0\" \\\n-\t\"bootscript=echo Running bootscript from mmc${mmcdev} ...; \" \\\n-\t\t\"source ${loadaddr}\\0\" \\\n-\t\"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\\0\" \\\n-\t\"mmcboot=echo Booting from mmc${mmcdev} ...; \" \\\n-\t\t\"run mmcargs; \" \\\n-\t\t\"bootm ${loadaddr}\\0\" \\\n-\n-#define CONFIG_BOOTCOMMAND \\\n-\t\"if mmc rescan ${mmcdev}; then \" \\\n-\t\t\"if run loadbootscript; then \" \\\n-\t\t\t\"run bootscript; \" \\\n-\t\t\"else \" \\\n-\t\t\t\"if run loaduimage; then \" \\\n-\t\t\t\t\"run mmcboot; \" \\\n-\t\t\t\"fi; \" \\\n-\t\t\"fi; \" \\\n-\t\"fi\"\n-\n-#define CONFIG_AUTO_COMPLETE\t\t1\n-\n-/*\n- * Miscellaneous configurable options\n- */\n-\n-#define CONFIG_SYS_LONGHELP\t/* undef to save memory */\n-#define CONFIG_SYS_HUSH_PARSER\t/* use \"hush\" command parser */\n-#define CONFIG_SYS_PROMPT_HUSH_PS2\t\"> \"\n #define CONFIG_SYS_PROMPT\t\t\"OMAP4430 SDP # \"\n-#define CONFIG_SYS_CBSIZE\t\t512\n-/* Print Buffer Size */\n-#define CONFIG_SYS_PBSIZE\t\t(CONFIG_SYS_CBSIZE + \\\n-\t\t\t\t\tsizeof(CONFIG_SYS_PROMPT) + 16)\n-#define CONFIG_SYS_MAXARGS\t\t16\n-/* Boot Argument Buffer Size */\n-#define CONFIG_SYS_BARGSIZE\t\t(CONFIG_SYS_CBSIZE)\n-\n-/*\n- * memtest setup\n- */\n-#define CONFIG_SYS_MEMTEST_START\t0x80000000\n-#define CONFIG_SYS_MEMTEST_END\t\t(CONFIG_SYS_MEMTEST_START + (32 << 20))\n-\n-/* Default load address */\n-#define CONFIG_SYS_LOAD_ADDR\t\t0x80000000\n-\n-/* Use General purpose timer 1 */\n-#define CONFIG_SYS_TIMERBASE\t\tGPT2_BASE\n-#define CONFIG_SYS_PTV\t\t\t2\t/* Divisor: 2^(PTV+1) => 8 */\n-#define CONFIG_SYS_HZ\t\t\t1000\n \n-/*\n- * Stack sizes\n- *\n- * The stack sizes are set up in start.S using the settings below\n- */\n-#define CONFIG_STACKSIZE\t(128 << 10)\t/* Regular stack */\n-#ifdef CONFIG_USE_IRQ\n-#define CONFIG_STACKSIZE_IRQ\t(4 << 10)\t/* IRQ stack */\n-#define CONFIG_STACKSIZE_FIQ\t(4 << 10)\t/* FIQ stack */\n-#endif\n-\n-/*\n- * SDRAM Memory Map\n- * Even though we use two CS all the memory\n- * is mapped to one contiguous block\n- */\n-#define CONFIG_NR_DRAM_BANKS\t1\n-\n-#define CONFIG_SYS_SDRAM_BASE\t\t0x80000000\n-#define CONFIG_SYS_INIT_RAM_ADDR\t0x4030D800\n-#define CONFIG_SYS_INIT_RAM_SIZE\t0x800\n-#define CONFIG_SYS_INIT_SP_ADDR\t\t(CONFIG_SYS_INIT_RAM_ADDR + \\\n-\t\t\t\t\t CONFIG_SYS_INIT_RAM_SIZE - \\\n-\t\t\t\t\t GENERATED_GBL_DATA_SIZE)\n-\n-#ifndef CONFIG_SYS_L2CACHE_OFF\n-#define CONFIG_SYS_L2_PL310\t\t1\n-#define CONFIG_SYS_PL310_BASE\t0x48242000\n-#endif\n-\n-/* Defines for SDRAM init */\n-#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS\n-#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION\n-#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS\n-#endif\n-\n-/* Defines for SPL */\n-#define CONFIG_SPL\n-#define CONFIG_SPL_TEXT_BASE\t\t0x40304350\n-#define CONFIG_SPL_MAX_SIZE\t\t(38 * 1024)\n-#define CONFIG_SPL_STACK\t\tLOW_LEVEL_SRAM_STACK\n-\n-#define CONFIG_SPL_BSS_START_ADDR\t0x80000000\n-#define CONFIG_SPL_BSS_MAX_SIZE\t\t0x80000\t\t/* 512 KB */\n-\n-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR\t0x300 /* address 0x60000 */\n-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS\t0x200 /* 256 KB */\n-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION\t1\n-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME\t\"u-boot.img\"\n-\n-#define CONFIG_SPL_LIBCOMMON_SUPPORT\n-#define CONFIG_SPL_LIBDISK_SUPPORT\n-#define CONFIG_SPL_I2C_SUPPORT\n-#define CONFIG_SPL_MMC_SUPPORT\n-#define CONFIG_SPL_FAT_SUPPORT\n-#define CONFIG_SPL_LIBGENERIC_SUPPORT\n-#define CONFIG_SPL_SERIAL_SUPPORT\n-#define CONFIG_SPL_LDSCRIPT \"arch/arm/cpu/armv7/omap-common/u-boot-spl.lds\"\n-\n-/*\n- * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM\n- * 64 bytes before this address should be set aside for u-boot.img's\n- * header. That is 0x800FFFC0--0x80100000 should not be used for any\n- * other needs.\n- */\n-#define CONFIG_SYS_TEXT_BASE\t\t0x80100000\n+#endif /* __CONFIG_SDP4430_H */\n \n-#endif /* __CONFIG_H */\n", "prefixes": [ "U-Boot", "v3", "1/3" ] }