Re: [OpenWrt-Devel] [OpenWrt-Commits] r30858 - in packages/utils/dosfstools: . files patches
Can we avoid whitespace-only changes? They increase effort to keeping up with what's been committed without adding any value, and I find it takes twice as long to search them to find out what, if anything, they functionally change. I literally have to read it a second time to figure out that they don't introduce any functional value... just to be sure I didn't miss anything hidden in there on the first reading. Thanks. On 3/8/12 6:11 PM, openwrt-comm...@openwrt.org wrote: Author: swalker Date: 2012-03-09 02:11:17 +0100 (Fri, 09 Mar 2012) New Revision: 30858 Added: packages/utils/dosfstools/files/ packages/utils/dosfstools/files/dosfsck.sh Modified: packages/utils/dosfstools/Makefile packages/utils/dosfstools/patches/002-linux_26_headers.patch Log: [packages] dosfstools: update to 3.0.12, add fsck script (#10697) [snip] Modified: packages/utils/dosfstools/patches/002-linux_26_headers.patch === --- packages/utils/dosfstools/patches/002-linux_26_headers.patch 2012-03-08 10:21:14 UTC (rev 30857) +++ packages/utils/dosfstools/patches/002-linux_26_headers.patch 2012-03-09 01:11:17 UTC (rev 30858) @@ -4,31 +4,29 @@ can be found in /usr/share/common-licenses/GPL-3 file. */ --# include asm/types.h +-#include asm/types.h +#include linux/types.h #ifndef _COMMON_H #define _COMMON_H --- a/src/dosfsck.h +++ b/src/dosfsck.h -@@ -32,8 +32,8 @@ - #define _LINUX_STRING_H_/* hack to avoid inclusion of linux/string.h*/ - #define _LINUX_FS_H /* hack to avoid inclusion of linux/fs.h */ +@@ -31,7 +31,7 @@ + #define _LINUX_STRING_H_/* hack to avoid inclusion of linux/string.h */ + #define _LINUX_FS_H /* hack to avoid inclusion of linux/fs.h */ --# include asm/types.h --# include asm/byteorder.h +-#include asm/types.h +#include linux/types.h -+#include asm/byteorder.h + #include asm/byteorder.h #include linux/msdos_fs.h - --- a/src/file.c +++ b/src/file.c -@@ -34,7 +34,7 @@ - #define _LINUX_STRING_H_/* hack to avoid inclusion of linux/string.h*/ - #define _LINUX_FS_H /* hack to avoid inclusion of linux/fs.h */ +@@ -33,7 +33,7 @@ + #define _LINUX_STRING_H_/* hack to avoid inclusion of linux/string.h */ + #define _LINUX_FS_H /* hack to avoid inclusion of linux/fs.h */ --# include asm/types.h +-#include asm/types.h +#include linux/types.h #include linux/msdos_fs.h @@ -49,7 +47,7 @@ #include time.h #include errno.h --# include asm/types.h +-#include asm/types.h +#include linux/types.h #if __BYTE_ORDER == __BIG_ENDIAN ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [OpenWrt-Commits] r30859 - packages/utils/fowsr
Is this a regression? You previously didn't copy fowsr.sh and pwsweather.sh
... is this a new script? You're deleting 3 lines but adding a combined copy of
5... 3 of which were previously there.
-Philip
On 3/8/12 9:24 PM, openwrt-comm...@openwrt.org wrote:
Author: swalker
Date: 2012-03-09 05:24:36 +0100 (Fri, 09 Mar 2012)
New Revision: 30859
Modified:
packages/utils/fowsr/Makefile
Log:
[packages] fowsr: update to 1.0-20110904
Modified: packages/utils/fowsr/Makefile
===
--- packages/utils/fowsr/Makefile 2012-03-09 01:11:17 UTC (rev 30858)
+++ packages/utils/fowsr/Makefile 2012-03-09 04:24:36 UTC (rev 30859)
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,13 +8,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fowsr
-PKG_VERSION:=1.0
-PKG_RELEASE:=20100718
+PKG_VERSION:=1.0-20110904
+PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://fowsr.googlecode.com/files
-PKG_MD5SUM:=34a53f0ba60a62636feef3e09d9e4312
+PKG_MD5SUM:=3dbe93a59d85bf89f9c1d20d54f5e983
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.0
+
include $(INCLUDE_DIR)/package.mk
define Package/fowsr
@@ -31,15 +33,12 @@
Output formats includes XML, Wunderground.com and pywws.
endef
-CONFIGURE_ARGS += \
- --with-linux-headers=$(LINUX_DIR) \
-
define Package/fowsr/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/fowsr $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/wunderground.sh $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/pywws.sh $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/xml.sh $(1)/usr/bin/
+ $(INSTALL_BIN) \
+ $(PKG_BUILD_DIR)/{fowsr,pwsweather,pywws,wunderground,xml}.sh \
+ $(1)/usr/bin/
endef
$(eval $(call BuildPackage,fowsr))
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [OpenWrt-Commits] r30858 - in packages/utils/dosfstools: . files patches
On 9 March 2012 23:19, Philip Prindeville philipp_s...@redfish-solutions.com wrote: Can we avoid whitespace-only changes? Not if it's the upstream code that has the whitespace changes (and thus patches need to be updated/rebased so that they apply again, like in this very commit). Regards, Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Updated kernel patch in trunk to support brcm47xx BCMA NAND flash
Hi Tatha,
sorry for answering so late I am currently very busy.
If I set CONFIG_BCMA_SFLASH=y and CONFIG_BCMA_NFLASH=y in the kernel
config, which I want to do for the default image in OpenWrt the image
will not work on by device with serial flash any more because
bus-drv_cc.flash_type will contain BCMA_NFLASH and not BCMA_SFLASH. The
patch in the mail I linked does not work as is with the current version
of your patch but you should be able to modify it. ;-)
The code in the linked mail should be able to detect nand flash at
runtime. Without this modification it does not work on my device, which
uses serial flash, but I do not know if it works on your device with
nand flash.
Hauke
On 03/01/2012 06:06 AM, Tathagata Das wrote:
Hi Hauke,
Changes mentioned in
https://lists.openwrt.org/pipermail/openwrt-devel/2012-January/013481.html
will not work now as there is no such bcma_nflash_init() function anymore.
Now flash detection is done only once and that is in NAND flash section using
generic function nand_scan_ident.
Regards,
Tatha
-Original Message-
From: Hauke Mehrtens [mailto:ha...@hauke-m.de]
Sent: 01 March 2012 04:39
To: Tathagata Das
Cc: 'OpenWrt Development List'; 'Florian Fainelli'
Subject: Re: [PATCH] Updated kernel patch in trunk to support brcm47xx BCMA
NAND flash
On 02/27/2012 09:44 AM, Tathagata Das wrote:
Hi Hauke,
I have modified my patch according to your comments except in two cases.
We want to build one image supporting devices with serial and with nand
flash. This makes it just possible to support one flash type at a time.
Right now flash type can be either NAND or SERIAL. If we want to have two
flash simultaneously then I think we need to have another parameter similar
to bcma_flash_type flash_type What is your opinion ?
I want to build one image which can be flashed onto a device which uses
NAND flash or a device using serial flash. I have never seen any device
with two (different) flash chips, so this does not have to be supported.
In the last patch it is only possible to build an image which will use
NAND flash or an image which will support serial flash, they are
exclusive or. I want to have it like it is for parallel and serial flash
where you are able to build an image with support for both and it auto
detects it when booting and loads the correct driver.
What about using this code, it work correctly on my device with serial
flash, but I do not know if it correctly detects nand flash?
https://lists.openwrt.org/pipermail/openwrt-devel/2012-January/013481.html
cpu_relax();
Why is this needed?
Above change was done according to Florian's comment.
using cpu_relax() is correct there, I just read some documentations
about it.
Florian,
Can you clarify it ?
Once these above cases resolve I will provide you the updated patch.
Regards,
Tatha
-Original Message-
From: Hauke Mehrtens [mailto:ha...@hauke-m.de]
Sent: 25 February 2012 19:08
To: Tathagata Das
Cc: 'OpenWrt Development List'; 'Florian Fainelli'
Subject: Re: [PATCH] Updated kernel patch in trunk to support brcm47xx BCMA
NAND flash
Hi Tathagata Das,
I had a look at bthe patch and added some comments, if bcma_nflash_init
is not needed any more where is struct bcma_nflash initilized?
Hauke
On 02/23/2012 02:27 PM, Tathagata Das wrote:
Hi,
Attached is the updated kernel patch to support brcm47xx BCMA NAND flash.
I have used latest trunk source code to create this patch.
Thanks to Florian and Hauke for their comments.
Regards,
Tathagata tathag...@alumnux.com
diff -Naur a/arch/mips/bcm47xx/bus.c b/arch/mips/bcm47xx/bus.c
--- a/arch/mips/bcm47xx/bus.c 2012-02-17 16:34:21.0 +0530
+++ b/arch/mips/bcm47xx/bus.c 2012-02-23 18:22:17.0 +0530
@@ -2,6 +2,7 @@
* BCM947xx nvram variable access
*
* Copyright (C) 2011 Hauke Mehrtens ha...@hauke-m.de
+ * Copyright (C) 2011-2012 Tathagata Das tathag...@alumnux.com
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -92,3 +93,9 @@
sflash-numblocks = scc-sflash.numblocks;
sflash-size = scc-sflash.size;
}
+
+void bcm47xx_nflash_struct_bcma_init(struct bcm47xx_nflash *nflash, struct
bcma_drv_cc *bcc)
+{
+ nflash-nflash_type = BCM47XX_BUS_TYPE_BCMA;
+ nflash-bcc = bcc;
+}
diff -Naur a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
--- a/arch/mips/bcm47xx/nvram.c 2012-02-17 16:34:22.0 +0530
+++ b/arch/mips/bcm47xx/nvram.c 2012-02-23 18:20:57.0 +0530
@@ -4,6 +4,7 @@
* Copyright (C) 2005 Broadcom Corporation
* Copyright (C) 2006 Felix Fietkau n...@openwrt.org
* Copyright (C) 2010-2011 Hauke Mehrtens ha...@hauke-m.de
+ * Copyright (C) 2011-2012 Tathagata Das tathag...@alumnux.com
*
* This program is free software; you can redistribute it and/or modify it
* under
