Re: [PATCH v2 5/5] tfa-layerscape: Change to github and use the latest tag
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- --- Original Message --- On Thursday, May 18th, 2023 at 4:56 PM, Christian Lamparter wrote: > On 4/21/23 10:59, Wojciech Dubowik via openwrt-devel wrote: > > > The dafault location of tfa-layerscape has been changed from > > codeuaurora to github. Also use the latest tag for Layerscape > > Linux Development POC from NXP. > > > > v2: > > * restored ls1012afrdm board > > * added platfrom defines to fiptool so ls-ddr-phy can be built > > > > Signed-off-by: Wojciech dubowikwojciech.dubo...@protonmail.ch > > > hmm, source.codeaurora.org (no longer?) resolves. So yes, this > needs to be updated. > > I ran into issues applying this particular patch though. > (PKG_RELEASE:=$(AUTORELEASE) has recently being canned, but this is easy to > fix) > > what I'm scratching my head about are these: > --- > Checking file > package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch > Hunk #1 succeeded at 1 with fuzz 1. > Hunk #4 FAILED at 39. > Hunk #5 FAILED at 77. > 2 out of 5 hunks FAILED > checking file > package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch > Hunk #2 FAILED at 26. > 1 out of 3 hunks FAILED > checking file > package/boot/tfa-layerscape/patches/004-plat-nxp-restore-ls1012afrdm-support.patch > --- > > could you have more local changes to: > 001-fiptool-hostbuild-fixes.patch > 003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch > ? That's strange as I haven't ran into such issues. I have just rebased patches on latest master. I have already fixed PKG_RELEASE and I have also removed two ls1028ardb specific patches which are not needed with the new uboot version. Changes are on the my github branch. Could you give it a try? https://github.com/wodu/openwrt/tree/ls-firmware Cheers, Wojtek > > which need to be part of this patch? > (or does this depend on a previous patch, that needs to be applied first)? > > Cheers, > Christian --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v2 5/5] tfa-layerscape: Change to github and use the latest tag
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- The dafault location of tfa-layerscape has been changed from codeuaurora to github. Also use the latest tag for Layerscape Linux Development POC from NXP. v2: * restored ls1012afrdm board * added platfrom defines to fiptool so ls-ddr-phy can be built Signed-off-by: Wojciech Dubowik --- package/boot/tfa-layerscape/Makefile | 15 +- .../patches/001-fiptool-hostbuild-fixes.patch | 37 ++- ...ix-create_pbl-and-byte_swap-host-bui.patch | 16 +- ...plat-nxp-restore-ls1012afrdm-support.patch | 232 ++ 4 files changed, 264 insertions(+), 36 deletions(-) create mode 100644 package/boot/tfa-layerscape/patches/004-plat-nxp-restore-ls1012afrdm-support.patch diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile index 072036da2f..d9d9242941 100644 --- a/package/boot/tfa-layerscape/Makefile +++ b/package/boot/tfa-layerscape/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tfa-layerscape -PKG_VERSION:=21.08 +PKG_VERSION:=lf-6.1.1-1.0.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/atf -PKG_SOURCE_VERSION:=LSDK-21.08 -PKG_MIRROR_HASH:=893f2d28a77dcc9d4413a619b4719ca5f1f4dc78dd824a8488e7d543e66bcf95 +PKG_SOURCE_URL:=https://github.com/nxp-qoriq/atf +PKG_SOURCE_VERSION:=lf-6.1.1-1.0.0 +PKG_MIRROR_HASH:=c0e3c7d0cc9ee5f9ae68cd705ce7f07f714c4fe3fd4a5a79de5699e7865b759f PKG_BUILD_DEPENDS:=tfa-layerscape/host include $(INCLUDE_DIR)/host-build.mk @@ -25,18 +25,19 @@ HOST_CFLAGS += -Wall -Werror -pedantic -std=c99 define Host/Compile $(MAKE) -C \ $(HOST_BUILD_DIR)/tools/fiptool \ + PLAT_FIPTOOL_HELPER_MK="$(HOST_BUILD_DIR)/tools/nxp/plat_fiptool/plat_fiptool.mk" CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ HOSTCCFLAGS="$(HOST_CFLAGS)" $(MAKE) -C \ - $(HOST_BUILD_DIR)/tools/nxp \ + $(HOST_BUILD_DIR)/tools/nxp/create_pbl \ CFLAGS="$(HOST_CFLAGS)" endef define Host/Install $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/fiptool/fiptool $(STAGING_DIR_HOST)/bin/fiptool-layerscape - $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/create_pbl $(STAGING_DIR_HOST)/bin/tfa-create-pbl - $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap + $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/create_pbl/create_pbl $(STAGING_DIR_HOST)/bin/tfa-create-pbl + $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/create_pbl/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap endef define Trusted-Firmware-A/Default diff --git a/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch b/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch index 4b74048754..8e7375cfa2 100644 --- a/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch +++ b/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -801,10 +801,6 @@ CRTTOOL ?= ${CRTTOOLPATH}/cert_create$ +@@ -914,10 +914,6 @@ CRTTOOL ?= ${CRTTOOLPATH}/cert_create$ ENCTOOLPATH ?= tools/encrypt_fw ENCTOOL ?= ${ENCTOOLPATH}/encrypt_fw${BIN_EXT} @@ -11,7 +11,7 @@ # Variables for use with sptool SPTOOLPATH?= tools/sptool SPTOOL?= ${SPTOOLPATH}/sptool${BIN_EXT} -@@ -1160,13 +1156,6 @@ endif +@@ -1322,13 +1318,6 @@ endif clean: @echo " CLEAN" $(call SHELL_REMOVE_DIR,${BUILD_PLAT}) @@ -25,7 +25,7 @@ ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} clean ${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean -@@ -1175,13 +1164,6 @@ realclean distclean: +@@ -1337,13 +1326,6 @@ realclean distclean: @echo " REALCLEAN" $(call SHELL_REMOVE_DIR,${BUILD_BASE}) $(call SHELL_DELETE_ALL, ${CURDIR}/cscope.*) @@ -39,37 +39,33 @@ ${Q}${MAKE} --no-print-directory -C ${SPTOOLPATH} clean ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} realclean -@@ -1238,7 +1220,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL} +@@ -1400,7 +1382,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL} @${ECHO_BLANK_LINE} endif -${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} ${FIPTOOL} +${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} - ${Q}${FIPTOOL}
Re: [PATCH 5/5] tfa-layerscape: Bump to lf-6.1.1-1.0.0 and switch to github
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- > > czw., 13 kwi 2023 o 09:13 Wojciech Dubowik via openwrt-devel > > openwrt-devel@lists.openwrt.org napisał(a): > > > > > The sender domain has a DMARC Reject/Quarantine policy which disallows > > > sending mailing list messages using the original "From" header. > > > > > > To mitigate this problem, the original message has been wrapped > > > automatically by the mailing list software. > > > > > > -- Forwarded message -- > > > From: Wojciech Dubowik wojciech.dubo...@protonmail.ch > > > To: openwrt-devel@lists.openwrt.org > > > Cc: Wojciech Dubowik wojciech.dubo...@protonmail.ch > > > Bcc: > > > Date: Thu, 13 Apr 2023 07:10:32 + > > > Subject: [PATCH 5/5] tfa-layerscape: Bump to lf-6.1.1-1.0.0 and switch to > > > github > > > The default location of tfa-layerscape has been changed from > > > codeuaurora to github. Also use the latest tag for Layerscape > > > Linux Development POC from NXP. > > > > > > Tested on: > > > * NXP FRWY-LS1012A > > > * NXP LS1046A-RDB > > > > > > Signed-off-by: Wojciech Dubowik wojciech.dubo...@protonmail.ch > > > > Hi Wojciech, > > > > Did you try to apply this patch to the master tree? > > > > I have a problem: > > > > git am index.html > > Applying: tfa-layerscape: Bump to lf-6.1.1-1.0.0 and switch to github > > .git/rebase-apply/patch:95: space before tab in indent. > > $(eval ${CHECK_FIP_CMD}) > > .git/rebase-apply/patch:106: space before tab in indent. > > $(eval ${CHECK_FWU_FIP_CMD}) > > .git/rebase-apply/patch:141: space before tab in indent. > > ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" > > SPTOOL=${SPTOOL} --no-print-directory -C ${SPTOOLPATH} > > error: patch failed: > > package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch:1 > > error: > > package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch: > > patch does not apply > > error: patch failed: > > package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch:26 > > error: > > package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch: > > patch does not apply > > Patch failed at 0001 tfa-layerscape: Bump to lf-6.1.1-1.0.0 and switch to > > github > > > Hello Paweł, > I can see it now. It applies foo me but I get whitespace warning and you get > an error. Porbably git settings. I will try to fix this and send V2. > Best Regards, > Wojciech Dubowik > I really have problems telling git that these whitespaces come from original NXP Makefile. So either you force rebase with whitespace errors or we drop 5th patch and I try to use github. Best Regards, Wojciech Dubowik > > > -- > > Best Regards, > > Paweł Dembicki --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH 5/5] tfa-layerscape: Bump to lf-6.1.1-1.0.0 and switch to github
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- > czw., 13 kwi 2023 o 09:13 Wojciech Dubowik via openwrt-devel > openwrt-devel@lists.openwrt.org napisał(a): > > > The sender domain has a DMARC Reject/Quarantine policy which disallows > > sending mailing list messages using the original "From" header. > > > > To mitigate this problem, the original message has been wrapped > > automatically by the mailing list software. > > > > -- Forwarded message -- > > From: Wojciech Dubowik wojciech.dubo...@protonmail.ch > > To: openwrt-devel@lists.openwrt.org > > Cc: Wojciech Dubowik wojciech.dubo...@protonmail.ch > > Bcc: > > Date: Thu, 13 Apr 2023 07:10:32 + > > Subject: [PATCH 5/5] tfa-layerscape: Bump to lf-6.1.1-1.0.0 and switch to > > github > > The default location of tfa-layerscape has been changed from > > codeuaurora to github. Also use the latest tag for Layerscape > > Linux Development POC from NXP. > > > > Tested on: > > * NXP FRWY-LS1012A > > * NXP LS1046A-RDB > > > > Signed-off-by: Wojciech Dubowik wojciech.dubo...@protonmail.ch > > > Hi Wojciech, > > Did you try to apply this patch to the master tree? > > I have a problem: > > git am index.html > Applying: tfa-layerscape: Bump to lf-6.1.1-1.0.0 and switch to github > .git/rebase-apply/patch:95: space before tab in indent. > $(eval ${CHECK_FIP_CMD}) > .git/rebase-apply/patch:106: space before tab in indent. > $(eval ${CHECK_FWU_FIP_CMD}) > .git/rebase-apply/patch:141: space before tab in indent. > ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" > SPTOOL=${SPTOOL} --no-print-directory -C ${SPTOOLPATH} > error: patch failed: > package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch:1 > error: package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch: > patch does not apply > error: patch failed: > package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch:26 > error: > package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch: > patch does not apply > Patch failed at 0001 tfa-layerscape: Bump to lf-6.1.1-1.0.0 and switch to > github Hello Paweł, I can see it now. It applies foo me but I get whitespace warning and you get an error. Porbably git settings. I will try to fix this and send V2. Best Regards, Wojciech Dubowik > > -- > Best Regards, > Paweł Dembicki --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 4/5] ppfe-firmware: Bump to lf-6.1.1-1.0.0 and switch to github
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- The default location of ppfe-firmware has been changed from codeuaurora to github. Also use the latest tag for Layerscape Linux Development POC from NXP. Tested on: * NXP FRWY-LS1012A Signed-off-by: Wojciech Dubowik --- package/firmware/layerscape/ppfe-firmware/Makefile | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/firmware/layerscape/ppfe-firmware/Makefile b/package/firmware/layerscape/ppfe-firmware/Makefile index 80aa15d67a..99d83b6a4e 100644 --- a/package/firmware/layerscape/ppfe-firmware/Makefile +++ b/package/firmware/layerscape/ppfe-firmware/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ppfe -PKG_VERSION:=21.08 +PKG_VERSION:=lf-6.1.1-1.0.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/NXP/qoriq-engine-pfe-bin.git -PKG_SOURCE_VERSION:=LSDK-21.08 -PKG_MIRROR_HASH:=f2591b12bc02dbfcf113dcb79cce2fc703d8492b7309ad75b3c4915b76966c64 +PKG_SOURCE_URL:=https://github.com/nxp-qoriq/qoriq-engine-pfe-bin +PKG_SOURCE_VERSION:=lf-6.1.1-1.0.0 +PKG_MIRROR_HASH:=eb1e3efe08980e70594060c84c1620a1dde53e00e96bae63d15dceb236c0bfa8 PKG_FLAGS:=nonshared -- 2.34.1 --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 3/5] fman-ucode: Bump to lf-6.1.1-1.0.0 and switch to github
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- The default location of fman-ucode has been changed from codeuaurora to github. Also use the latest tag for Layerscape Linux Development POC from NXP. Tested on: * NXP LS1046A-RDB Signed-off-by: Wojciech Dubowik --- package/firmware/layerscape/fman-ucode/Makefile | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/firmware/layerscape/fman-ucode/Makefile b/package/firmware/layerscape/fman-ucode/Makefile index 0d2ae68283..9c7d4c7cd0 100644 --- a/package/firmware/layerscape/fman-ucode/Makefile +++ b/package/firmware/layerscape/fman-ucode/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fman-ucode -PKG_VERSION:=21.08 +PKG_VERSION:=lf-6.1.1-1.0.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/NXP/qoriq-fm-ucode.git -PKG_SOURCE_VERSION:=LSDK-21.08 -PKG_MIRROR_HASH:=fc3c249c20b823e9554764f875c3d600b05f2e3659262d79f081e6765e891c96 +PKG_SOURCE_URL:=https://github.com/nxp-qoriq/qoriq-fm-ucode +PKG_SOURCE_VERSION:=lf-6.1.1-1.0.0 +PKG_MIRROR_HASH:=3614200837945460374570a48822a3efb96a64b93724e7f973e61008baeccf3a PKG_FLAGS:=nonshared -- 2.34.1 --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 1/5] ls-rcw: Bump to lf-6.1.1-1.0.0 and switch to github
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- The default location of ls-rcw has been changed from codeuaurora to github. Also use the latest tag for Layerscape Linux Development POC from NXP. Tested on: * NXP FRWY-LS1012A * NXP LS1046A-RDB Signed-off-by: Wojciech Dubowik --- package/firmware/layerscape/ls-rcw/Makefile | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/firmware/layerscape/ls-rcw/Makefile b/package/firmware/layerscape/ls-rcw/Makefile index d16b69be2d..786d9ae8a1 100644 --- a/package/firmware/layerscape/ls-rcw/Makefile +++ b/package/firmware/layerscape/ls-rcw/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ls-rcw -PKG_VERSION:=21.08 +PKG_VERSION:=lf-6.1.1-1.0.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/rcw -PKG_SOURCE_VERSION:=LSDK-21.08 -PKG_MIRROR_HASH:=5b6ae3937d8c64f24c2d09d21e892e60b9f60de3573ca64ef19fa71072e6e346 +PKG_SOURCE_URL:=https://github.com/nxp-qoriq/rcw +PKG_SOURCE_VERSION:=lf-6.1.1-1.0.0 +PKG_MIRROR_HASH:=3127285549a0a7dd3cded20c2fbfb67b06943faa8dab529f61936dc1bea177db PKG_FLAGS:=nonshared -- 2.34.1 --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 0/5] layerscape: [firmware/boot]: Bump to lf-6.1.1-1.0.0
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- Bump to the latest tagged version from new NXP Layerscape Linux Distribution POC. The codeaurora project is not anymore used for layerscape related packages. They have all been moved to github so adapt sources accordingly. Wojciech Dubowik (5): ls-rcw: Bump to lf-6.1.1-1.0.0 and switch to github uboot-layerscape: Bump to lf-6.1.1-1.0.0 and switch to github fman-ucode: Bump to lf-6.1.1-1.0.0 and switch to github ppfe-firmware: Bump to lf-6.1.1-1.0.0 and switch to github tfa-layerscape: Bump to lf-6.1.1-1.0.0 and switch to github package/boot/tfa-layerscape/Makefile | 14 +++ .../patches/001-fiptool-hostbuild-fixes.patch | 41 +-- ...ix-create_pbl-and-byte_swap-host-bui.patch | 20 + package/boot/uboot-layerscape/Makefile| 8 ++-- .../firmware/layerscape/fman-ucode/Makefile | 8 ++-- package/firmware/layerscape/ls-rcw/Makefile | 8 ++-- .../layerscape/ppfe-firmware/Makefile | 8 ++-- 7 files changed, 55 insertions(+), 52 deletions(-) -- 2.34.1 --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 5/5] tfa-layerscape: Bump to lf-6.1.1-1.0.0 and switch to github
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- The default location of tfa-layerscape has been changed from codeuaurora to github. Also use the latest tag for Layerscape Linux Development POC from NXP. Tested on: * NXP FRWY-LS1012A * NXP LS1046A-RDB Signed-off-by: Wojciech Dubowik --- package/boot/tfa-layerscape/Makefile | 14 +++ .../patches/001-fiptool-hostbuild-fixes.patch | 41 +-- ...ix-create_pbl-and-byte_swap-host-bui.patch | 20 + 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile index 072036da2f..a45f59d4e3 100644 --- a/package/boot/tfa-layerscape/Makefile +++ b/package/boot/tfa-layerscape/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tfa-layerscape -PKG_VERSION:=21.08 +PKG_VERSION:=lf-6.1.1-1.0.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/atf -PKG_SOURCE_VERSION:=LSDK-21.08 -PKG_MIRROR_HASH:=893f2d28a77dcc9d4413a619b4719ca5f1f4dc78dd824a8488e7d543e66bcf95 +PKG_SOURCE_URL:=https://github.com/nxp-qoriq/atf +PKG_SOURCE_VERSION:=lf-6.1.1-1.0.0 +PKG_MIRROR_HASH:=c0e3c7d0cc9ee5f9ae68cd705ce7f07f714c4fe3fd4a5a79de5699e7865b759f PKG_BUILD_DEPENDS:=tfa-layerscape/host include $(INCLUDE_DIR)/host-build.mk @@ -29,14 +29,14 @@ define Host/Compile LDFLAGS="$(HOST_LDFLAGS)" \ HOSTCCFLAGS="$(HOST_CFLAGS)" $(MAKE) -C \ - $(HOST_BUILD_DIR)/tools/nxp \ + $(HOST_BUILD_DIR)/tools/nxp/create_pbl \ CFLAGS="$(HOST_CFLAGS)" endef define Host/Install $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/fiptool/fiptool $(STAGING_DIR_HOST)/bin/fiptool-layerscape - $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/create_pbl $(STAGING_DIR_HOST)/bin/tfa-create-pbl - $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap + $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/create_pbl/create_pbl $(STAGING_DIR_HOST)/bin/tfa-create-pbl + $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/create_pbl/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap endef define Trusted-Firmware-A/Default diff --git a/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch b/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch index 4b74048754..1c9057d6a8 100644 --- a/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch +++ b/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch @@ -1,6 +1,8 @@ a/Makefile -+++ b/Makefile -@@ -801,10 +801,6 @@ CRTTOOL ?= ${CRTTOOLPATH}/cert_create$ +Index: tfa-layerscape-lf-6.1.1-1.0.0/Makefile +=== +--- tfa-layerscape-lf-6.1.1-1.0.0.orig/Makefile tfa-layerscape-lf-6.1.1-1.0.0/Makefile +@@ -914,10 +914,6 @@ CRTTOOL ?= ${CRTTOOLPATH}/cert_create$ ENCTOOLPATH ?= tools/encrypt_fw ENCTOOL ?= ${ENCTOOLPATH}/encrypt_fw${BIN_EXT} @@ -11,7 +13,7 @@ # Variables for use with sptool SPTOOLPATH?= tools/sptool SPTOOL?= ${SPTOOLPATH}/sptool${BIN_EXT} -@@ -1160,13 +1156,6 @@ endif +@@ -1322,13 +1318,6 @@ endif clean: @echo " CLEAN" $(call SHELL_REMOVE_DIR,${BUILD_PLAT}) @@ -25,7 +27,7 @@ ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} clean ${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean -@@ -1175,13 +1164,6 @@ realclean distclean: +@@ -1337,13 +1326,6 @@ realclean distclean: @echo " REALCLEAN" $(call SHELL_REMOVE_DIR,${BUILD_BASE}) $(call SHELL_DELETE_ALL, ${CURDIR}/cscope.*) @@ -39,37 +41,33 @@ ${Q}${MAKE} --no-print-directory -C ${SPTOOLPATH} clean ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} realclean -@@ -1238,7 +1220,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL} +@@ -1400,7 +1382,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL} @${ECHO_BLANK_LINE} endif -${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} ${FIPTOOL} +${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} + $(eval ${CHECK_FIP_CMD}) ${Q}${FIPTOOL} create ${FIP_ARGS} $@ ${Q}${FIPTOOL} info $@ - @${ECHO_BLANK_LINE} -@@ -1254,7 +1236,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT +@@ -1417,7 +1399,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT @${ECHO_BLANK_LI
[PATCH 2/5] uboot-layerscape: Bump to lf-6.1.1-1.0.0 and switch to github
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- The default location of uboot-layerscape has been changed from codeuaurora to github. Also use the latest tag for Layerscape Linux Development POC from NXP. Tested on: * NXP FRWY-LS1012A * NXP LS1046A-RDB Signed-off-by: Wojciech Dubowik --- package/boot/uboot-layerscape/Makefile | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile index 53d21f59dc..fbadf49955 100644 --- a/package/boot/uboot-layerscape/Makefile +++ b/package/boot/uboot-layerscape/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-layerscape -PKG_VERSION:=21.08 +PKG_VERSION:=lf-6.1.1-1.0.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot -PKG_SOURCE_VERSION:=LSDK-21.08 -PKG_MIRROR_HASH:=54909a98bdcc26c7f9b35b35fcae09b977ecbf044be7bffa6dad9306c47cccf6 +PKG_SOURCE_URL:=https://github.com/nxp-qoriq/u-boot +PKG_SOURCE_VERSION:=lf-6.1.1-1.0.0 +PKG_MIRROR_HASH:=f4a3a262fd8923af72dede0348a512c05b756e3925279553eaf1c6667b186fb4 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk -- 2.34.1 --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v2 2/2] mpc85xx: Add 5.15 kernel as testing and fix configs
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- V2: Split patches for better change visibility Build system: x86_64 Build-tested: generic Run-tested: generic/TL-WDR4900 v1 board from TP-Link Signed-off-by: Wojciech Dubowik --- target/linux/mpc85xx/Makefile | 1 + target/linux/mpc85xx/config-5.15 | 3 +++ target/linux/mpc85xx/p1020/config-default | 1 + target/linux/mpc85xx/p2020/config-default | 1 + 4 files changed, 6 insertions(+) diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 398e578882..f5f5a9c5c1 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -12,6 +12,7 @@ FEATURES:=squashfs ramdisk nand SUBTARGETS:=p1010 p1020 p2020 KERNEL_PATCHVER:=5.10 +KERNEL_TESTING_PATCHVER:=5.15 KERNELNAME:=zImage diff --git a/target/linux/mpc85xx/config-5.15 b/target/linux/mpc85xx/config-5.15 index 532d176c15..4f27d3bd70 100644 --- a/target/linux/mpc85xx/config-5.15 +++ b/target/linux/mpc85xx/config-5.15 @@ -57,6 +57,7 @@ CONFIG_DNOTIFY=y CONFIG_DTC=y # CONFIG_E200 is not set CONFIG_E500=y +CONFIG_E500_CPU=y # CONFIG_E5500_CPU is not set # CONFIG_E6500_CPU is not set CONFIG_EARLY_PRINTK=y @@ -194,6 +195,7 @@ CONFIG_PHYSICAL_START=0x CONFIG_PPC=y CONFIG_PPC32=y # CONFIG_PPC64 is not set +# CONFIG_PPC_BOOK3S_32 is not set CONFIG_PPC_85xx=y # CONFIG_PPC_8xx is not set CONFIG_PPC_ADV_DEBUG_DACS=2 @@ -254,6 +256,7 @@ CONFIG_THREAD_SHIFT=13 CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y # CONFIG_TL_WDR4900_V1 is not set +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set # CONFIG_TQM8540 is not set # CONFIG_TQM8541 is not set # CONFIG_TQM8548 is not set diff --git a/target/linux/mpc85xx/p1020/config-default b/target/linux/mpc85xx/p1020/config-default index 6f2a9d2c3b..73176a87dc 100644 --- a/target/linux/mpc85xx/p1020/config-default +++ b/target/linux/mpc85xx/p1020/config-default @@ -34,6 +34,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NR_CPUS=2 CONFIG_PADATA=y +# CONFIG_PPC_QUEUED_SPINLOCKS is not set CONFIG_REGMAP_IRQ=y CONFIG_REGULATOR=y CONFIG_RFS_ACCEL=y diff --git a/target/linux/mpc85xx/p2020/config-default b/target/linux/mpc85xx/p2020/config-default index e4ed758d95..1d9ef14276 100644 --- a/target/linux/mpc85xx/p2020/config-default +++ b/target/linux/mpc85xx/p2020/config-default @@ -19,6 +19,7 @@ CONFIG_NR_CPUS=2 CONFIG_PADATA=y CONFIG_PCI_MSI=y CONFIG_PPC_MSI_BITMAP=y +# CONFIG_PPC_QUEUED_SPINLOCKS is not set CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_RTC_DRV_DS1307=y -- 2.34.1 --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH v2 1/2] mpc85xx: Copy over kernel 5.10 patches and config to 5.15
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- v2: Split patches for kernel 5.15 support Signed-off-by: Wojciech Dubowik --- target/linux/mpc85xx/config-5.15 | 276 ++ ...85xx-add-gpio-keys-to-of-match-table.patch | 10 + ...0-powerpc-85xx-tl-wdr4900-v1-support.patch | 91 ++ .../101-powerpc-85xx-hiveap-330-support.patch | 30 ++ .../102-powerpc-add-cmdline-override.patch| 41 +++ .../103-powerpc-85xx-red-15w-rev1.patch | 33 +++ ...change-P2020RDB-dts-file-for-OpenWRT.patch | 170 +++ .../105-powerpc-85xx-panda-support.patch | 30 ++ .../106-powerpc-85xx-ws-ap3710i-support.patch | 30 ++ ...-powerpc-85xx-add-ws-ap3825i-support.patch | 37 +++ ...-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch | 39 +++ ...ootwrapper-disable-uImage-generation.patch | 44 +++ 12 files changed, 831 insertions(+) create mode 100644 target/linux/mpc85xx/config-5.15 create mode 100644 target/linux/mpc85xx/patches-5.15/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch create mode 100644 target/linux/mpc85xx/patches-5.15/100-powerpc-85xx-tl-wdr4900-v1-support.patch create mode 100644 target/linux/mpc85xx/patches-5.15/101-powerpc-85xx-hiveap-330-support.patch create mode 100644 target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch create mode 100644 target/linux/mpc85xx/patches-5.15/103-powerpc-85xx-red-15w-rev1.patch create mode 100644 target/linux/mpc85xx/patches-5.15/104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch create mode 100644 target/linux/mpc85xx/patches-5.15/105-powerpc-85xx-panda-support.patch create mode 100644 target/linux/mpc85xx/patches-5.15/106-powerpc-85xx-ws-ap3710i-support.patch create mode 100644 target/linux/mpc85xx/patches-5.15/107-powerpc-85xx-add-ws-ap3825i-support.patch create mode 100644 target/linux/mpc85xx/patches-5.15/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch create mode 100644 target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch diff --git a/target/linux/mpc85xx/config-5.15 b/target/linux/mpc85xx/config-5.15 new file mode 100644 index 00..532d176c15 --- /dev/null +++ b/target/linux/mpc85xx/config-5.15 @@ -0,0 +1,276 @@ +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_ADVANCED_OPTIONS is not set +CONFIG_AR8216_PHY=y +CONFIG_AR8216_PHY_LEDS=y +CONFIG_ARCH_32BIT_OFF_T=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_KEEP_MEMBLOCK=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_ARCH_MMAP_RND_BITS=11 +CONFIG_ARCH_MMAP_RND_BITS_MAX=17 +CONFIG_ARCH_MMAP_RND_BITS_MIN=11 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 +CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y +CONFIG_ASN1=y +CONFIG_AUDIT_ARCH=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BOOKE=y +CONFIG_BOOKE_WDT=y +# CONFIG_BSC9131_RDB is not set +# CONFIG_BSC9132_QDS is not set +# CONFIG_C293_PCIE is not set +CONFIG_CLONE_BACKWARDS=y +CONFIG_CLZ_TAB=y +CONFIG_CMDLINE="console=ttyS0,115200" +CONFIG_CMDLINE_FROM_BOOTLOADER=y +# CONFIG_CMDLINE_OVERRIDE is not set +# CONFIG_COMMON_CLK is not set +CONFIG_COMPAT_32BIT_TIME=y +# CONFIG_CORENET_GENERIC is not set +# CONFIG_CPM2 is not set +CONFIG_CPU_BIG_ENDIAN=y +# CONFIG_CRYPTO_AES_PPC_SPE is not set +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AUTHENC=y +CONFIG_CRYPTO_BLAKE2S=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 +# CONFIG_CRYPTO_MD5_PPC is not set +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RSA=y +# CONFIG_CRYPTO_SHA1_PPC is not set +# CONFIG_CRYPTO_SHA1_PPC_SPE is not set +# CONFIG_CRYPTO_SHA256_PPC_SPE is not set +CONFIG_DATA_SHIFT=12 +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DNOTIFY=y +CONFIG_DTC=y +# CONFIG_E200 is not set +CONFIG_E500=y +# CONFIG_E5500_CPU is not set +# CONFIG_E6500_CPU is not set +CONFIG_EARLY_PRINTK=y +CONFIG_EDAC=y +CONFIG_EDAC_ATOMIC_SCRUB=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_LEGACY_SYSFS=y +CONFIG_EDAC_MPC85XX=y +CONFIG_EDAC_SUPPORT=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_ETHERNET_PACKET_MANGLE=y +CONFIG_FIXED_PHY=y +CONFIG_FSL_BOOKE=y +CONFIG_FSL_EMB_PERFMON=y +# CONFIG_FSL_FMAN is not set +CONFIG_FSL_LBC=y +CONFIG_FSL_PCI=y +CONFIG_FSL_PQ_MDIO=y +CONFIG_FSL_SOC=y +CONFIG_FSL_SOC_BOOKE=y +CONFIG_FW_LOADER_PAGED_BUF=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_CPU=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFI
[PATCH] mpc85xx: Add testing linux v5.15 support
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- Build system: x86_64 Build-tested: generic Run-tested: generic/TL-WDR4900 v1 board from TP-Link Signed-off-by: Wojciech Dubowik --- target/linux/mpc85xx/Makefile | 1 + target/linux/mpc85xx/config-5.15 | 276 ++ ...85xx-add-gpio-keys-to-of-match-table.patch | 10 + ...0-powerpc-85xx-tl-wdr4900-v1-support.patch | 83 ++ .../101-powerpc-85xx-hiveap-330-support.patch | 30 ++ .../102-powerpc-add-cmdline-override.patch| 37 +++ .../103-powerpc-85xx-red-15w-rev1.patch | 29 ++ ...change-P2020RDB-dts-file-for-OpenWRT.patch | 170 +++ .../105-powerpc-85xx-panda-support.patch | 30 ++ .../106-powerpc-85xx-ws-ap3710i-support.patch | 30 ++ ...-powerpc-85xx-add-ws-ap3825i-support.patch | 37 +++ ...ootwrapper-disable-uImage-generation.patch | 42 +++ 12 files changed, 775 insertions(+) create mode 100644 target/linux/mpc85xx/config-5.15 create mode 100644 target/linux/mpc85xx/patches-5.15/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch create mode 100644 target/linux/mpc85xx/patches-5.15/100-powerpc-85xx-tl-wdr4900-v1-support.patch create mode 100644 target/linux/mpc85xx/patches-5.15/101-powerpc-85xx-hiveap-330-support.patch create mode 100644 target/linux/mpc85xx/patches-5.15/102-powerpc-add-cmdline-override.patch create mode 100644 target/linux/mpc85xx/patches-5.15/103-powerpc-85xx-red-15w-rev1.patch create mode 100644 target/linux/mpc85xx/patches-5.15/104-powerpc-mpc85xx-change-P2020RDB-dts-file-for-OpenWRT.patch create mode 100644 target/linux/mpc85xx/patches-5.15/105-powerpc-85xx-panda-support.patch create mode 100644 target/linux/mpc85xx/patches-5.15/106-powerpc-85xx-ws-ap3710i-support.patch create mode 100644 target/linux/mpc85xx/patches-5.15/107-powerpc-85xx-add-ws-ap3825i-support.patch create mode 100644 target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 6bf096740e..8909ce61f4 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -12,6 +12,7 @@ FEATURES:=squashfs ramdisk SUBTARGETS:=p1010 p1020 p2020 KERNEL_PATCHVER:=5.10 +KERNEL_TESTING_PATCHVER:=5.15 KERNELNAME:=zImage diff --git a/target/linux/mpc85xx/config-5.15 b/target/linux/mpc85xx/config-5.15 new file mode 100644 index 00..ab7bc235ea --- /dev/null +++ b/target/linux/mpc85xx/config-5.15 @@ -0,0 +1,276 @@ +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_ADVANCED_OPTIONS is not set +CONFIG_AR8216_PHY=y +CONFIG_AR8216_PHY_LEDS=y +CONFIG_ARCH_32BIT_OFF_T=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_KEEP_MEMBLOCK=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_ARCH_MMAP_RND_BITS=11 +CONFIG_ARCH_MMAP_RND_BITS_MAX=17 +CONFIG_ARCH_MMAP_RND_BITS_MIN=11 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 +CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y +CONFIG_ASN1=y +CONFIG_AUDIT_ARCH=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BOOKE=y +CONFIG_BOOKE_WDT=y +# CONFIG_BSC9131_RDB is not set +# CONFIG_BSC9132_QDS is not set +# CONFIG_C293_PCIE is not set +CONFIG_CLONE_BACKWARDS=y +CONFIG_CLZ_TAB=y +CONFIG_CMDLINE="console=ttyS0,115200" +CONFIG_CMDLINE_FROM_BOOTLOADER=y +# CONFIG_CMDLINE_OVERRIDE is not set +# CONFIG_COMMON_CLK is not set +CONFIG_COMPAT_32BIT_TIME=y +# CONFIG_CORENET_GENERIC is not set +# CONFIG_CPM2 is not set +CONFIG_CPU_BIG_ENDIAN=y +# CONFIG_CRYPTO_AES_PPC_SPE is not set +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AUTHENC=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 +# CONFIG_CRYPTO_MD5_PPC is not set +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RSA=y +# CONFIG_CRYPTO_SHA1_PPC is not set +# CONFIG_CRYPTO_SHA1_PPC_SPE is not set +# CONFIG_CRYPTO_SHA256_PPC_SPE is not set +CONFIG_DATA_SHIFT=12 +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DNOTIFY=y +CONFIG_DTC=y +# CONFIG_E200 is not set +CONFIG_E500=y +# CONFIG_E5500_CPU is not set +# CONFIG_E6500_CPU is not set +CONFIG_EARLY_PRINTK=y +CONFIG_EDAC=y +CONFIG_EDAC_ATOMIC_SCRUB=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_LEGACY_SYSFS=y +CONFIG_EDAC_MPC85XX=y +CONFIG_EDAC_SUPPORT=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_ETHERNET_PACKET_MANGLE=y +CONFIG_FIXED_PHY=y +CONFIG_FSL_BOOKE=y +CONFIG_FSL_EMB_PERFMON=y +# CONFIG_FSL_FMAN is not set +CONFIG_FSL_LBC=y +CONFIG_FSL_PCI=y +CONFIG_FSL_PQ_MDIO=y +CONFIG_FSL_SOC=y +CONFIG_FSL_SOC_BOOKE=y +CONFIG_FW_LOADER_PAGED_BUF=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_GENERIC_ATOMIC64=y +
[PATCH] usteer: Fix better candidate not being set in policy
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software.--- Begin Message --- The candidate is never set in this loop. Fix it by setting it to the first valid entry. Signed-off-by: Wojciech Dubowik --- policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policy.c b/policy.c index a7efc06..8155e24 100644 --- a/policy.c +++ b/policy.c @@ -143,7 +143,7 @@ find_better_candidate(struct sta_info *si_ref, struct uevent *ev, uint32_t requi ev->select_reasons = reasons; } - if (candidate && si->signal > candidate->signal) + if (!candidate || si->signal > candidate->signal) candidate = si; } -- 2.25.1 --- End Message --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] procd: trace: Define syscall registers for powerpc platform
According to manpage the syscall nr is stored in r0 and return value in r3 for powerpc. Define it so we can use seccomp and utrace on powerpc. Signed-off-by: Wojciech Dubowik --- jail/seccomp-bpf.h | 3 +++ trace/trace.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/jail/seccomp-bpf.h b/jail/seccomp-bpf.h index fc3ffe7..fd6b3e2 100644 --- a/jail/seccomp-bpf.h +++ b/jail/seccomp-bpf.h @@ -81,6 +81,9 @@ struct seccomp_data { # else # define ARCH_NR AUDIT_ARCH_ARMEB # endif +#elif defined(__PPC__) +# define REG_SYSCALL regs.gpr[0] +# define ARCH_NR AUDIT_ARCH_PPC #else # warning "Platform does not support seccomp filter yet" # define REG_SYSCALL 0 diff --git a/trace/trace.c b/trace/trace.c index 665c22e..78b99dd 100644 --- a/trace/trace.c +++ b/trace/trace.c @@ -58,6 +58,9 @@ # if defined(__ARM_EABI__) # define reg_retval_nr _offsetof(struct user, regs.uregs[0]) # endif +#elif defined(__PPC__) +#define reg_syscall_nr _offsetof(struct user, regs.gpr[0]) +#define reg_retval_nr _offsetof(struct user, regs.gpr[3]) #else #error tracing is not supported on this architecture #endif -- 2.17.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/2] procd: Enable seccomp for powerpc
Signed-off-by: Wojciech Dubowik --- package/system/procd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 6fe609140d..104cae782a 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -57,7 +57,7 @@ endef define Package/procd-seccomp SECTION:=base CATEGORY:=Base system - DEPENDS:=@arm||@armeb||@mips||@mipsel||@i386||@x86_64 @!TARGET_uml @KERNEL_SECCOMP +libubox +libblobmsg-json + DEPENDS:=@arm||@armeb||@mips||@mipsel||@i386||@powerpc||@x86_64 @!TARGET_uml @KERNEL_SECCOMP +libubox +libblobmsg-json TITLE:=OpenWrt process seccomp helper + utrace endef -- 2.17.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/3] krikwood: Make Iconnect image use new ubi format style
To flash first time follow instructions in commit: "kirkwood/dockstar: use ubi(kernel, squashfs, ubifs) images" Signed-off-by: Wojciech Dubowik <wojciech.dubo...@neratec.com> --- target/linux/kirkwood/base-files/lib/upgrade/platform.sh | 6 -- target/linux/kirkwood/image/Makefile | 11 +++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh index be5f101..af0ac7c 100644 --- a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh +++ b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh @@ -14,7 +14,8 @@ platform_check_image() { } return 0 ;; - "dockstar") + "dockstar"|\ + "iconnect") nand_do_platform_check $board $1 return $? ;; @@ -39,7 +40,8 @@ platform_pre_upgrade() { local board=$(kirkwood_board_name) case "$board" in - "dockstar") + "dockstar"|\ + "iconnect") nand_do_upgrade $1 ;; esac diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index d38ee71..071c700 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/image.mk DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE KERNEL_IN_UBI KERNEL_LOADADDR:=0x8000 -TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome +TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome iconnect define Device/Default KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) @@ -47,6 +47,12 @@ $(Device/dockstar) DEVICE_DTS := kirkwood-goflexhome endef +define Device/iconnect +$(Device/dockstar) + PROFILES := Generic ICONNECT + DEVICE_DTS := kirkwood-iconnect +endef + define Device/linksys-audi DEVICE_DTS := kirkwood-linksys-audi PAGESIZE := 512 @@ -176,9 +182,6 @@ Image/InstallKernel/Template/Generic=$(call Image/InstallKernel/Template) Image/BuildKernel/Template/IB62X0=$(call Image/BuildKernel/Template,ib62x0) Image/InstallKernel/Template/IB62X0=$(call Image/InstallKernel/Template,ib62x0) -Image/BuildKernel/Template/ICONNECT=$(call Image/BuildKernel/Template,iconnect) -Image/InstallKernel/Template/ICONNECT=$(call Image/InstallKernel/Template,iconnect) - Image/BuildKernel/Template/IOMEGA_IX2_200=$(call Image/BuildKernel/Template,iomega_ix2_200) Image/InstallKernel/Template/IOMEGA_IX2_200=$(call Image/InstallKernel/Template,iomega_ix2_200) -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 0/3] kirkwood: Use new UBI image style for Iconnect
Adapt Iconnect to new UBI (kernel, squashfs, ubifs) image format. Wojciech Dubowik (3): uboot-kirkwood: New ubi flash format for Iconnect kirkwood: Migrate Iconnect to new ubi image format krikwood: Make Iconnect image use new ubi format style .../boot/uboot-kirkwood/patches/120-iconnect.patch | 20 .../kirkwood/base-files/lib/upgrade/platform.sh | 6 -- target/linux/kirkwood/image/Makefile | 11 +++ target/linux/kirkwood/patches-4.4/130-iconnect.patch | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/3] uboot-kirkwood: New ubi flash format for Iconnect
Migrate Iconnect to new ubi image style like for dockstar. Signed-off-by: Wojciech Dubowik <wojciech.dubo...@neratec.com> --- .../boot/uboot-kirkwood/patches/120-iconnect.patch | 20 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch index e525ca0..cfc1403 100644 --- a/package/boot/uboot-kirkwood/patches/120-iconnect.patch +++ b/package/boot/uboot-kirkwood/patches/120-iconnect.patch @@ -1,6 +1,6 @@ --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h -@@ -66,30 +66,35 @@ +@@ -66,30 +66,29 @@ #define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x2 @@ -13,14 +13,12 @@ #define CONFIG_BOOTCOMMAND \ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ - "ubi part rootfs; " \ -+ "ubi part root; " \ - "ubifsmount ubi:rootfs; " \ - "ubifsload 0x80 ${kernel}; "\ +- "ubifsmount ubi:rootfs; " \ +- "ubifsload 0x80 ${kernel}; "\ - "bootm 0x80" -+ "ubifsload 0x70 ${fdt}; " \ -+ "ubifsumount; " \ -+ "fdt addr 0x70; fdt resize; fdt chosen; " \ -+ "bootz 0x80 - 0x70" ++ "ubi part ubi; "\ ++ "ubi read 0x80 kernel; "\ ++ "bootz 0x80" #define CONFIG_MTDPARTS \ - "mtdparts=orion_nand:" \ @@ -31,7 +29,7 @@ + "0xe@0x0(uboot)," \ + "0x2@0xe(uboot_env)," \ + "0x10@0x10(second_stage_uboot),"\ -+ "-@0x20(root)\0" ++ "-@0x20(ubi)\0" #define CONFIG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0"\ @@ -39,9 +37,7 @@ "mtdparts="CONFIG_MTDPARTS \ - "kernel=/boot/uImage\0" \ - "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0" -+ "kernel=/boot/zImage\0" \ -+ "fdt=/boot/iconnect.dtb\0" \ -+ "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0" ++ "bootargs_root=\0" /* * Ethernet driver configuration -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/3] kirkwood: Migrate Iconnect to new ubi image format
Default partition name is now ubi. Signed-off-by: Wojciech Dubowik <wojciech.dubo...@neratec.com> --- target/linux/kirkwood/patches-4.4/130-iconnect.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/kirkwood/patches-4.4/130-iconnect.patch b/target/linux/kirkwood/patches-4.4/130-iconnect.patch index c95579d..2d0a376 100644 --- a/target/linux/kirkwood/patches-4.4/130-iconnect.patch +++ b/target/linux/kirkwood/patches-4.4/130-iconnect.patch @@ -34,7 +34,7 @@ - label = "boot"; - reg = <0x98 0x1f40>; + partition@20 { -+ label = "root"; ++ label = "ubi"; + reg = <0x20 0x1fe0>; }; }; -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] kernel: crypto: add fsl CAAM package
On 06/02/16 02:42, Dirk Neukirchen wrote: some comments: - follow alphabetic order - keep crypto-hw prefix - dump vendor I would suggest: crypto-hw-caam Reasoning: talitos, omap, ccp, geode do not contain hw vendor name The caam crypto is also present on mpc85xx target, at least for P1010. You could also add ||TARGET_mpc85xx. Wojtek unsure: since this package is specific to imx6 you may want to use target/linux/imx6/modules.mk (like sunxi, ar71xx ...) On 06.02.2016 00:11, Pushpal Sidhu wrote: Kernel package enables the Freescale CAAM (crypto accelerator and assurance module, aka SEC4). Sets kernel defaults for ringsize, intc, and debug. Signed-off-by: Pushpal Sidhu--- package/kernel/linux/modules/crypto.mk | 24 1 file changed, 24 insertions(+) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 99fb5a0..f328ac5 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -194,6 +194,30 @@ endef $(eval $(call KernelPackage,crypto-hw-ccp)) +define KernelPackage/crypto-fsl-caam + TITLE:=Freescale CAAM driver + DEPENDS:=@TARGET_imx6 +kmod-crypto-aead +kmod-crypto-authenc +kmod-crypto-hash +kmod-random-core + KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ + CONFIG_CRYPTO_DEV_FSL_CAAM \ + CONFIG_CRYPTO_DEV_FSL_CAAM_JR \ + CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API \ + CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API \ + CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API \ + CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9 \ + CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=n \ + CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG=n + FILES:= \ + $(LINUX_DIR)/drivers/crypto/caam/caam.ko \ + $(LINUX_DIR)/drivers/crypto/caam/caamalg.ko \ + $(LINUX_DIR)/drivers/crypto/caam/caamhash.ko \ + $(LINUX_DIR)/drivers/crypto/caam/caam_jr.ko \ + $(LINUX_DIR)/drivers/crypto/caam/caamrng.ko + AUTOLOAD:=$(call AutoLoad,09,caam caamalg caamhash caam_jr caamrng) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-fsl-caam)) define KernelPackage/crypto-hw-geode TITLE:=AMD Geode hardware crypto module ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] mpc85xx: Kernel crash with binutils 2.25.1
After the from binutils from 2.24-linaro to 2.25.1 I see following crash on mpc85xx platform. Error relocating /etc/preinit: unsupported relocation type 6 Error relocating /etc/preinit: unsupported relocation type 4 Error relocating /etc/preinit: unsupported relocation type 6 Error relocating /etc/preinit: unsupported relocation type 4 Error relocating /etc/preinit: unsupported relocation type 6 Error relocating /etc/preinit: unsupported relocation type 4 Error relocating /etc/preinit: unsupported relocation type 6 Error relocating /etc/preinit: unsupported relocation type 4 [2.032055] Kernel panic - not syncing: Attempted to kill init! exitcode=0x7f00 Looks like it generates some illegal assembly or so. Wojtek ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v3] [packages] linuxptp: Add package
Linuxptp is a user space software implementation of IEEE 1588 Precision Time Protocol standard. v3: Remove offending UCLIBC references Signed-off-by: Wojciech Dubowik <wojciech.dubo...@neratec.com> --- net/linuxptp/Makefile | 51 + net/linuxptp/patches/001-musl-fix.patch | 12 2 files changed, 63 insertions(+) create mode 100644 net/linuxptp/Makefile create mode 100644 net/linuxptp/patches/001-musl-fix.patch diff --git a/net/linuxptp/Makefile b/net/linuxptp/Makefile new file mode 100644 index 000..f0c9c9d --- /dev/null +++ b/net/linuxptp/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=linuxptp +PKG_VERSION:=20151118 +PKG_RELEASE:=1 +PKG_REV:=999c86f4a9da4bf4508b3a69289f58166ed18a55 + +#PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=git://git.code.sf.net/p/linuxptp/code +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_PROTO:=git +PKG_MD5SUM:= + +include $(INCLUDE_DIR)/package.mk + +define Package/linuxptp + SECTION:=net + CATEGORY:=Network + SUBMENU:=Time Synchronization + TITLE:=Linux Precision Time Protocol (PTP) daemon + URL:=http://linuxptp.sourceforge.net/ + DEPENDS:=+librt +endef + +define Package/linuxptp/description + The PTP daemon (PTPd) implements version 2 of the Precision Time Protocol (PTP) + as defined by the IEEE 1588-2008 standard. + PTP was developed to provide very precise time coordination of LAN connected + computers. +endef + +define Package/linuxptp/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwstamp_ctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/phc2sys $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/phc_ctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/pmc $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ptp4l $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/timemaster $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,linuxptp)) diff --git a/net/linuxptp/patches/001-musl-fix.patch b/net/linuxptp/patches/001-musl-fix.patch new file mode 100644 index 000..41302c7 --- /dev/null +++ b/net/linuxptp/patches/001-musl-fix.patch @@ -0,0 +1,12 @@ +Index: linuxptp-20151118/raw.c +=== +--- linuxptp-20151118.orig/raw.c 2016-01-08 13:39:56.0 +0100 linuxptp-20151118/raw.c2016-01-13 09:16:51.951784148 +0100 +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + #include + #include + #include -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2] [packages]: linuxptp: Add package
Linuxptp is a user space software implementation of IEEE 1588 Precision Time Protocol standard. V2: Removed uClibc patches Signed-off-by: Wojciech Dubowik <wojciech.dubo...@neratec.com> --- net/linuxptp/Makefile | 51 + net/linuxptp/patches/001-musl-fix.patch | 14 + 2 files changed, 65 insertions(+) create mode 100644 net/linuxptp/Makefile create mode 100644 net/linuxptp/patches/001-musl-fix.patch diff --git a/net/linuxptp/Makefile b/net/linuxptp/Makefile new file mode 100644 index 000..f0c9c9d --- /dev/null +++ b/net/linuxptp/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=linuxptp +PKG_VERSION:=20151118 +PKG_RELEASE:=1 +PKG_REV:=999c86f4a9da4bf4508b3a69289f58166ed18a55 + +#PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=git://git.code.sf.net/p/linuxptp/code +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_PROTO:=git +PKG_MD5SUM:= + +include $(INCLUDE_DIR)/package.mk + +define Package/linuxptp + SECTION:=net + CATEGORY:=Network + SUBMENU:=Time Synchronization + TITLE:=Linux Precision Time Protocol (PTP) daemon + URL:=http://linuxptp.sourceforge.net/ + DEPENDS:=+librt +endef + +define Package/linuxptp/description + The PTP daemon (PTPd) implements version 2 of the Precision Time Protocol (PTP) + as defined by the IEEE 1588-2008 standard. + PTP was developed to provide very precise time coordination of LAN connected + computers. +endef + +define Package/linuxptp/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwstamp_ctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/phc2sys $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/phc_ctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/pmc $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ptp4l $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/timemaster $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,linuxptp)) diff --git a/net/linuxptp/patches/001-musl-fix.patch b/net/linuxptp/patches/001-musl-fix.patch new file mode 100644 index 000..618a958 --- /dev/null +++ b/net/linuxptp/patches/001-musl-fix.patch @@ -0,0 +1,14 @@ +Index: linuxptp-20150608/raw.c +=== +--- linuxptp-20150608.orig/raw.c 2015-07-07 15:02:17.0 +0200 linuxptp-20150608/raw.c2015-07-09 08:54:30.222883143 +0200 +@@ -20,7 +20,9 @@ + #include + #include + #include ++#if defined(__UCLIBC__) + #include ++#endif + #include + #include + #include -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v4] [packages]: linuxptp: Add package
Linuxptp is a user space software implementation of IEEE 1588 Precision Time Protocol standard. v4: Don't compile on uclibc Signed-off-by: Wojciech Dubowik <wojciech.dubo...@neratec.com> --- net/linuxptp/Makefile | 50 + net/linuxptp/patches/001-musl-fix.patch | 12 2 files changed, 62 insertions(+) create mode 100644 net/linuxptp/Makefile create mode 100644 net/linuxptp/patches/001-musl-fix.patch diff --git a/net/linuxptp/Makefile b/net/linuxptp/Makefile new file mode 100644 index 000..2d9d3a8 --- /dev/null +++ b/net/linuxptp/Makefile @@ -0,0 +1,50 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=linuxptp +PKG_VERSION:=20151118 +PKG_RELEASE:=1 +PKG_REV:=999c86f4a9da4bf4508b3a69289f58166ed18a55 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=git://git.code.sf.net/p/linuxptp/code +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_PROTO:=git +PKG_MD5SUM:= + +include $(INCLUDE_DIR)/package.mk + +define Package/linuxptp + SECTION:=net + CATEGORY:=Network + SUBMENU:=Time Synchronization + TITLE:=Linux Precision Time Protocol (PTP) daemon + URL:=http://linuxptp.sourceforge.net/ + DEPENDS:=@!USE_UCLIBC +librt +endef + +define Package/linuxptp/description + The PTP daemon (PTPd) implements version 2 of the Precision Time Protocol (PTP) + as defined by the IEEE 1588-2008 standard. + PTP was developed to provide very precise time coordination of LAN connected + computers. +endef + +define Package/linuxptp/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwstamp_ctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/phc2sys $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/phc_ctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/pmc $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ptp4l $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/timemaster $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,linuxptp)) diff --git a/net/linuxptp/patches/001-musl-fix.patch b/net/linuxptp/patches/001-musl-fix.patch new file mode 100644 index 000..41302c7 --- /dev/null +++ b/net/linuxptp/patches/001-musl-fix.patch @@ -0,0 +1,12 @@ +Index: linuxptp-20151118/raw.c +=== +--- linuxptp-20151118.orig/raw.c 2016-01-08 13:39:56.0 +0100 linuxptp-20151118/raw.c2016-01-13 09:16:51.951784148 +0100 +@@ -20,7 +20,6 @@ + #include + #include + #include +-#include + #include + #include + #include -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] linuxptp: Add package
Linuxptp is a user space software implementation of IEEE 1588 Precision Time Protocol standard. Signed-off-by: Wojciech Dubowik <wojciech.dubo...@neratec.com> --- net/linuxptp/Makefile | 51 +++ net/linuxptp/patches/001-uclibc-compile-fix.patch | 16 +++ net/linuxptp/patches/002-clock-adj-fix.patch | 20 + net/linuxptp/patches/003-musl-fix.patch | 14 +++ 4 files changed, 101 insertions(+) create mode 100644 net/linuxptp/Makefile create mode 100644 net/linuxptp/patches/001-uclibc-compile-fix.patch create mode 100644 net/linuxptp/patches/002-clock-adj-fix.patch create mode 100644 net/linuxptp/patches/003-musl-fix.patch diff --git a/net/linuxptp/Makefile b/net/linuxptp/Makefile new file mode 100644 index 000..f0c9c9d --- /dev/null +++ b/net/linuxptp/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=linuxptp +PKG_VERSION:=20151118 +PKG_RELEASE:=1 +PKG_REV:=999c86f4a9da4bf4508b3a69289f58166ed18a55 + +#PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=git://git.code.sf.net/p/linuxptp/code +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_PROTO:=git +PKG_MD5SUM:= + +include $(INCLUDE_DIR)/package.mk + +define Package/linuxptp + SECTION:=net + CATEGORY:=Network + SUBMENU:=Time Synchronization + TITLE:=Linux Precision Time Protocol (PTP) daemon + URL:=http://linuxptp.sourceforge.net/ + DEPENDS:=+librt +endef + +define Package/linuxptp/description + The PTP daemon (PTPd) implements version 2 of the Precision Time Protocol (PTP) + as defined by the IEEE 1588-2008 standard. + PTP was developed to provide very precise time coordination of LAN connected + computers. +endef + +define Package/linuxptp/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwstamp_ctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/phc2sys $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/phc_ctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/pmc $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ptp4l $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/timemaster $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,linuxptp)) diff --git a/net/linuxptp/patches/001-uclibc-compile-fix.patch b/net/linuxptp/patches/001-uclibc-compile-fix.patch new file mode 100644 index 000..53fccd5 --- /dev/null +++ b/net/linuxptp/patches/001-uclibc-compile-fix.patch @@ -0,0 +1,16 @@ +Index: linuxptp-20150309/timemaster.c +=== +--- linuxptp-20150309.orig/timemaster.c2015-03-10 17:18:07.0 +0100 linuxptp-20150309/timemaster.c 2015-03-11 14:44:36.992811174 +0100 +@@ -24,7 +24,11 @@ + #include + #include + #include ++#if defined(__UCLIBC__) ++#undef HAVE_POSIX_SPAWN ++#else + #include ++#endif + #include + #include + #include diff --git a/net/linuxptp/patches/002-clock-adj-fix.patch b/net/linuxptp/patches/002-clock-adj-fix.patch new file mode 100644 index 000..eb9ada9 --- /dev/null +++ b/net/linuxptp/patches/002-clock-adj-fix.patch @@ -0,0 +1,20 @@ +Index: linuxptp-20150608/clockadj.c +=== +--- linuxptp-20150608.orig/clockadj.c 2015-07-07 15:02:17.0 +0200 linuxptp-20150608/clockadj.c 2015-07-09 08:52:59.406122765 +0200 +@@ -31,6 +31,15 @@ + static long realtime_hz; + static long realtime_nominal_tick; + ++#if defined(__UCLIBC__) ++/* This syscall is not defined in uClibc 0.93.2 */ ++#include ++static int clock_adjtime(clockid_t id, struct timex *tx) ++{ ++ return syscall(__NR_clock_adjtime, id, tx); ++} ++#endif ++ + void clockadj_init(clockid_t clkid) + { + #ifdef _SC_CLK_TCK diff --git a/net/linuxptp/patches/003-musl-fix.patch b/net/linuxptp/patches/003-musl-fix.patch new file mode 100644 index 000..618a958 --- /dev/null +++ b/net/linuxptp/patches/003-musl-fix.patch @@ -0,0 +1,14 @@ +Index: linuxptp-20150608/raw.c +=== +--- linuxptp-20150608.orig/raw.c 2015-07-07 15:02:17.0 +0200 linuxptp-20150608/raw.c2015-07-09 08:54:30.222883143 +0200 +@@ -20,7 +20,9 @@ + #include + #include + #include ++#if defined(__UCLIBC__) + #include ++#endif + #include + #include + #include -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] mpc85xx: Add PTP node for TL-WD4900 in device tree
PTP requires at least one timer to be 1PPS so describe it. For testing, load kernel module gianfar_ptp and use ptp4l from linuxptp. Copied from FSL P1010RDB reference design. Signed-off-by: Wojciech Dubowik <wojciech.dubo...@neratec.com> --- .../mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts | 13 + 1 file changed, 13 insertions(+) diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts index 0d79dc0..2325006 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts @@ -145,6 +145,19 @@ can1: can@1d000 { status = "disabled"; }; + + ptp_clock@b0e00 { + compatible = "fsl,etsec-ptp"; + reg = <0xb0e00 0xb0>; + interrupts = <68 2 0 0 69 2 0 0 70 2 0 0>; + fsl,cksel = <1>; + fsl,tclk-period = <5>; + fsl,tmr-prsc= <2>; + fsl,tmr-add = <0xcccd>; + fsl,tmr-fiper1 = <0x3b9ac9fb>; /* 1PPS */ + fsl,tmr-fiper2 = <0x00018696>; + fsl,max-adj = <24999>; + }; }; pci0: pcie@ffe09000 { -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] fstools: Check FS state before writing
It reduces number of flash writes on systems with FS ready. Signed-off-by: Wojciech Dubowik <wojciech.dubo...@neratec.com> --- libfstools/overlay.c | 3 ++- mount_root.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libfstools/overlay.c b/libfstools/overlay.c index 7f69606..b51a6ae 100644 --- a/libfstools/overlay.c +++ b/libfstools/overlay.c @@ -251,7 +251,8 @@ jffs2_switch(struct volume *v) return ret; sync(); - fs_state_set("/overlay", FS_STATE_READY); + if (fs_state_get("/overlay") != FS_STATE_READY) + fs_state_set("/overlay", FS_STATE_READY); return 0; } diff --git a/mount_root.c b/mount_root.c index bf70265..29b2758 100644 --- a/mount_root.c +++ b/mount_root.c @@ -106,7 +106,8 @@ done(int argc, char *argv[1]) case FS_JFFS2: case FS_UBIFS: - fs_state_set("/overlay", FS_STATE_READY); + if (fs_state_get("/overlay") != FS_STATE_READY) + fs_state_set("/overlay", FS_STATE_READY); break; } -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Device tree issues with TL-WDR4900 (mpc85xx) and kernel 4.0.1
On 07/05/15 14:26, Heiner Kallweit wrote: [snip] Even with this patch I got some possible dead lock warnings so it might be just a partial cure. BTW it's a bit scary for future use. Looks like jffs2 doesn't get enough care... Regards, Wojtek Heiner Thanks for the hints! Because you mentioned that you have lots of problems with gianfar under 4.0: what kind of problems? I have got locking problems when using multiqueue on gianfar. I have no problems on 3.18. There is also reset issue on SGMII interface but if you are using TL-WDR4900 you have RGMII, so no problem. Wojtek Heiner ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Device tree issues with TL-WDR4900 (mpc85xx) and kernel 4.0.1
On 06/05/15 21:23, Heiner Kallweit wrote: Am 05.05.2015 um 22:17 schrieb Heiner Kallweit: Am 05.05.2015 um 08:29 schrieb Wojciech Dubowik: On 04/05/15 22:45, Heiner Kallweit wrote: I tried to make the TL-WDR4900 work under kernel 4.0. Adjusting the platform-specific patches was quickly done and the system boots. However I get the following error messages. [2.959975] /leds/system: could not get #gpio-cells for /soc@ffe0/gpio-controller@f000 [2.968276] leds-gpio: probe of leds failed with error -22 [ 34.622909] /buttons/reset: could not get #gpio-cells for /soc@ffe0/gpio-controller@f000 [ 34.631383] gpio-keys buttons: Failed to get gpio flags, error: -22 [ 34.637657] gpio-keys: probe of buttons failed with error -22 I'm not a device tree expert, what I checked so far: The gpio-related section in tl-wdr4900-v1.dts is empty gpio0: gpio-controller@f000 { }; Gpio controller is now at fc00. See latest commit for arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi. Regards, Wojtek PS. I have been also trying 4.0 but I have ran into so many problems with gianfar that I have given it up. For now... Thanks. I face issues with the network as well and had to attach a serial console + tftpboot to make it work again. Back to 3.19.0 now .. Heiner I gave it one more try and replaced the gianfar driver from 4.0.1 with the one from 3.19.0. Results: - When rebooting first time after flashing the system (4.0.1) came up properly and was reachable via network. - After next reboot: system hangs Booting the failing system with a serial console attached shows that after procd -init- nothing happens. I can log in via serial console. ps -ef showed that /etc/rc.d/S00sysfixtime was hanging. Checking the commands in this script manually I figured out that each access to /etc/uci-default blocks the console. Seems like the first start after flashing the system does something bad with /etc/uci-defaults. Or for whatever reason something can't deal properly with the empty /etc/uci-defaults after the second boot. No clue whom to blame .. Try to boot with kernel locking enabled. I have seen jffs2 deadlocks on readdir. As far as I remember with this patch it went through but I don't know anymore whether I have changed sth in config. Have a look at (search engine...) [PATCH] fs: jffs2: Add setup code for spi nor flash. Even with this patch I got some possible dead lock warnings so it might be just a partial cure. BTW it's a bit scary for future use. Looks like jffs2 doesn't get enough care... Regards, Wojtek Heiner ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Device tree issues with TL-WDR4900 (mpc85xx) and kernel 4.0.1
On 07/05/15 14:49, Felix Fietkau wrote: On 2015-05-07 08:01, Wojciech Dubowik wrote: Try to boot with kernel locking enabled. I have seen jffs2 deadlocks on readdir. As far as I remember with this patch it went through but I don't know anymore whether I have changed sth in config. Have a look at (search engine...) [PATCH] fs: jffs2: Add setup code for spi nor flash. Even with this patch I got some possible dead lock warnings so it might be just a partial cure. BTW it's a bit scary for future use. Looks like jffs2 doesn't get enough care... I believe the locking issues are an overlayfs regression, maybe even the same one as this one (which I fixed years ago): http://linux-fsdevel.vger.kernel.narkive.com/XRtXLDlf/patch-1-2-overlayfs-fix-a-deadlock-in-ovl-dir-read-merged I believe this is the cause of the regression: commit 49c21e1cacd74a8c83407c70ad860c994e606e25 Author: Miklos Szeredi mszer...@suse.cz Date: Sat Dec 13 00:59:42 2014 +0100 ovl: check whiteout while reading directory Don't make a separate pass for checking whiteouts, since we can do it while reading the upper directory. This will make it easier to handle multiple layers. Signed-off-by: Miklos Szeredi mszer...@suse.cz It probably happens like this: overlayfs does a readdir, in which jffs2 takes a lock. From within the readdir fill callback, it calls lookup_one_len, which ends up back in jffs2 and tries to take the same lock again. = deadlock. This is exactly what I have seen. I have got deadlocks on readdir. Unfortunately I don't have any logs saved... Wojtek - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Device tree issues with TL-WDR4900 (mpc85xx) and kernel 4.0.1
On 04/05/15 22:45, Heiner Kallweit wrote: I tried to make the TL-WDR4900 work under kernel 4.0. Adjusting the platform-specific patches was quickly done and the system boots. However I get the following error messages. [2.959975] /leds/system: could not get #gpio-cells for /soc@ffe0/gpio-controller@f000 [2.968276] leds-gpio: probe of leds failed with error -22 [ 34.622909] /buttons/reset: could not get #gpio-cells for /soc@ffe0/gpio-controller@f000 [ 34.631383] gpio-keys buttons: Failed to get gpio flags, error: -22 [ 34.637657] gpio-keys: probe of buttons failed with error -22 I'm not a device tree expert, what I checked so far: The gpio-related section in tl-wdr4900-v1.dts is empty gpio0: gpio-controller@f000 { }; Gpio controller is now at fc00. See latest commit for arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi. Regards, Wojtek PS. I have been also trying 4.0 but I have ran into so many problems with gianfar that I have given it up. For now... However #gpio-cells is defined in fsl/pq3-gpio-0.dtsi and this file is imported by fsl/p1010si-post.dtsi. And fsl/p1010si-post.dtsi is imported by tl-wdr4900-v1.dts. This worked under 3.19 (despite the fact that 3.19 was never officially supported for this device), seems like something with the DT handling has changed in 4.0. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/4] [package] uboot-kirkwood: update to 2013.10
Hello, I have just tried second stage and it seems to work. My Iconnect is powering my FHEM rig at the moment so I will test first stage when I have JTAG around. Br, Wojtek iconnect = tftp 0x80 openwrt-kirkwood-iconnect_second_stage-u-boot.img Using egiga0 device TFTP from server 192.168.1.104; our IP address is 192.168.1.20 Filename 'openwrt-kirkwood-iconnect_second_stage-u-boot.img'. Load address: 0x80 Loading: ### 3.9 MiB/s done Bytes transferred = 443740 (6c55c hex) iconnect = bootm 0x80 ## Booting kernel from Legacy Image at 0080 ... Image Name: OpenWrt Das U-Boot uImage Image Type: ARM Linux Kernel Image (uncompressed) Data Size:443676 Bytes = 433.3 KiB Load Address: 0060 Entry Point: 0060 Verifying Checksum ... OK Loading Kernel Image ... OK Using machid 0xb36 from environment Starting kernel ... U-Boot 2013.10 (Dec 17 2013 - 10:25:08) Iomega iConnect SoC: Kirkwood 88F6281_A0 DRAM: 256 MiB WARNING: Caches not enabled NAND: 512 MiB Using default environment In:serial Out: serial Err: serial Net: egiga0 Warning: failed to set MAC address Hit any key to stop autoboot: 0 iconnect = pri baudrate=115200 bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw bootcmd=setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:rootfs; ubifsload 0x80 ${kernel}; ubifsload 0x70 ${fdt}; ubifsumount; fdt addr 0x70 bootdelay=3 console=console=ttyS0,115200 ethact=egiga0 fdt=/boot/iconnect.dtb ipaddr=192.168.1.1 kernel=/boot/zImage mtdids=nand0=orion_nand mtdparts=mtdparts=orion_nand:0xe@0x0(uboot),0x2@0xe(uboot_env),0x10@0x10(second_stage_uboot),-@0x20(root) serverip=192.168.1.2 stderr=serial stdin=serial stdout=serial Environment size: 683/131068 bytes iconnect = - Original Message - Hi Alexander, On Mon, Dec 16, 2013 at 08:54:04AM +0100, Alexander Couzens wrote: I've tested it the dockstar uboot as well the ubifs commands. The kirkwood target should depend on target images options include zImage and include dtb into rootfs. Thank you for testing! Now we only need someone with iconnect board to verify everything is working ok... Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/1] [uhttpd]: Fix appending https ports to cmdline
Otherwise uhttpd is started only on non-secure ports. Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- package/network/services/uhttpd/files/uhttpd.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 51f7547..ce30483 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -112,7 +112,7 @@ start_instance() append_arg $cfg key -K for listen in $https; do - append UHTTPD_ARGS -s $listen + procd_append_param command -s $listen done } } -- 1.8.1.2 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 0/5] [kirkwood]: Enable device tree support
Enable device tree support for selected targets. Not all kirkwood variants are ported so one can use generic uImage file for them. DTS files are appended to zImage and then wrapped into uImage. Wojciech Dubowik (5): [uboot-kirkwood]: Upgrade to 2013.07 [uboot-kirkwood]: Enable device tree support [kirkwood]: Add 3.10 kernel support [kirkwood]: Add generic profile [kirkwood]: Bump kernel to 3.10.12 package/boot/uboot-kirkwood/Makefile | 4 +- .../boot/uboot-kirkwood/patches/110-dockstar.patch | 2 +- .../patches/120-enable-device-tree.patch | 9 + target/linux/kirkwood/Makefile | 4 +- target/linux/kirkwood/config-3.10 | 285 + target/linux/kirkwood/image/Makefile | 22 +- .../kirkwood/patches-3.10/001-partition_map.patch | 11 + .../kirkwood/patches-3.10/002-mvsdio_delay.patch | 32 +++ target/linux/kirkwood/profiles/100-Generic.mk | 19 ++ 9 files changed, 382 insertions(+), 6 deletions(-) create mode 100644 package/boot/uboot-kirkwood/patches/120-enable-device-tree.patch create mode 100644 target/linux/kirkwood/config-3.10 create mode 100644 target/linux/kirkwood/patches-3.10/001-partition_map.patch create mode 100644 target/linux/kirkwood/patches-3.10/002-mvsdio_delay.patch create mode 100644 target/linux/kirkwood/profiles/100-Generic.mk -- 1.8.1.2 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/5] [uboot-kirkwood]: Upgrade to 2013.07
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- package/boot/uboot-kirkwood/Makefile | 4 ++-- package/boot/uboot-kirkwood/patches/110-dockstar.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/boot/uboot-kirkwood/Makefile b/package/boot/uboot-kirkwood/Makefile index dc66450..6ca1a95 100644 --- a/package/boot/uboot-kirkwood/Makefile +++ b/package/boot/uboot-kirkwood/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=u-boot -PKG_VERSION:=2012.10 +PKG_VERSION:=2013.07 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot -PKG_MD5SUM:=8655f63b1e5c4647295ac9ce44660be3 +PKG_MD5SUM:=8445162690052e6afd4b8f87af2bb557 PKG_TARGETS:=bin include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch index 4ff7e57..7c9667b 100644 --- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch +++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch @@ -6,7 +6,7 @@ #define CONFIG_BOOTCOMMAND \ - setenv bootargs ${console} ${mtdparts} ${bootargs_root}; \ - ubi part root; \ -- ubifsmount root; \ +- ubifsmount ubi:root; \ - ubifsload 0x80 ${kernel}; \ - ubifsload 0x110 ${initrd}; \ - bootm 0x80 0x110 -- 1.8.1.2 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 5/5] [kirkwood]: Bump kernel to 3.10.12
Enable device tree support on dockstar, goflexnet, ib62x0, iconnect and nsa310 boards. The device tree is appended to in uImage so there is no need to load it separately. Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- target/linux/kirkwood/Makefile | 4 ++-- target/linux/kirkwood/image/Makefile | 22 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index f0dda5a..1d5495a 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -12,11 +12,11 @@ BOARDNAME:=Marvell Kirkwood FEATURES:=targz usb jffs2_nand MAINTAINER:=Imre Kaloz ka...@openwrt.org -LINUX_VERSION:=3.3.8 +LINUX_VERSION:=3.10.12 include $(INCLUDE_DIR)/target.mk -KERNELNAME:=uImage +KERNELNAME:=uImage zImage dtbs DEFAULT_PACKAGES += diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 7be27e6..7c53ef0 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -7,11 +7,31 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk +TARGET_DTBS := kirkwood-dockstar kirkwood-goflexnet kirkwood-ib62x0 \ + kirkwood-iconnect kirkwood-nsa310 NAND_BLOCKSIZE := 2048:128k +LOADADDR:=0x8000 +UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage + +define Image/Build/MkuImage + mkimage -A arm -O linux -T kernel -a $(LOADADDR) -C none -e $(LOADADDR) \ + -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(1) $(2); +endef + +define Image/Build/DTB + cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1); + cat $(LINUX_DIR)/arch/$(ARCH)/boot/dts/$(1).dtb $(KDIR)/zImage$(2)-$(1); + $(call Image/Build/MkuImage,$(KDIR)/zImage$(2)-$(1),$(KDIR)/uImage$(2)-$(1)) + cp $(KDIR)/uImage$(2)-$(1) $(UIMAGE)$(2)-$(1); +endef + define Image/BuildKernel -# do mach-id fixup here, if needed cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage + $(foreach dtb,$(TARGET_DTBS),$(call Image/Build/DTB,$(dtb))) +ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) + $(call Image/Build/Initramfs) +endif endef define Image/Build -- 1.8.1.2 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/5] [kirkwood]: Add 3.10 kernel support
Enable device tree support for selected targets. Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- target/linux/kirkwood/config-3.10 | 285 + .../kirkwood/patches-3.10/001-partition_map.patch | 11 + .../kirkwood/patches-3.10/002-mvsdio_delay.patch | 32 +++ 3 files changed, 328 insertions(+) create mode 100644 target/linux/kirkwood/config-3.10 create mode 100644 target/linux/kirkwood/patches-3.10/001-partition_map.patch create mode 100644 target/linux/kirkwood/patches-3.10/002-mvsdio_delay.patch diff --git a/target/linux/kirkwood/config-3.10 b/target/linux/kirkwood/config-3.10 new file mode 100644 index 000..c061273 --- /dev/null +++ b/target/linux/kirkwood/config-3.10 @@ -0,0 +1,285 @@ +CONFIG_ALIGNMENT_TRAP=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_KIRKWOOD=y +CONFIG_ARCH_KIRKWOOD_DT=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_REQUIRE_GPIOLIB=y +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARM=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set +CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y +# CONFIG_ARM_CPU_SUSPEND is not set +CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_NR_BANKS=8 +CONFIG_ARM_PATCH_PHYS_VIRT=y +# CONFIG_ARM_THUMB is not set +# CONFIG_ARPD is not set +CONFIG_ATAGS=y +CONFIG_BLK_DEV_SD=y +CONFIG_CACHE_FEROCEON_L2=y +# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set +# CONFIG_CACHE_L2X0 is not set +# CONFIG_CHARGER_MANAGER is not set +CONFIG_CLKDEV_LOOKUP=y +CONFIG_CLKSRC_MMIO=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_CMDLINE=rootdelay=1 root=/dev/mmcblk0p1 noinitrd console=ttyS0,115200 +CONFIG_CMDLINE_FROM_BOOTLOADER=y +CONFIG_COMMON_CLK=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_FEROCEON=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y +CONFIG_CPU_FEROCEON=y +# CONFIG_CPU_FEROCEON_OLD_ID is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_PM=y +CONFIG_CPU_TLB_FEROCEON=y +CONFIG_CPU_USE_DOMAINS=y +CONFIG_CRC16=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_DEBUG_LL_INCLUDE=mach/debug-macro.S +# CONFIG_DEBUG_PINCTRL is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DLCI is not set +CONFIG_DNOTIFY=y +CONFIG_DTC=y +CONFIG_EXT4_FS=y +CONFIG_FRAME_POINTER=y +CONFIG_FS_MBCACHE=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIO_GENERIC=y +CONFIG_GPIO_MVEBU=y +CONFIG_GPIO_SYSFS=y +# CONFIG_HAMRADIO is not set +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_BPF_JIT=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_GENERIC_HARDIRQS=y +CONFIG_HAVE_IDE=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_UID16=y +CONFIG_HW_RANDOM=y +CONFIG_HZ_PERIODIC=y +CONFIG_INET_LRO=y +CONFIG_INITRAMFS_SOURCE= +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_IRQCHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_WORK=y +CONFIG_JBD2=y +CONFIG_KTIME_SCALAR=y +CONFIG_LEDS_GPIO=y +# CONFIG_LEDS_REGULATOR is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +# CONFIG_MACH_CLOUDBOX_DT is not set +# CONFIG_MACH_D2NET_V2 is not set +# CONFIG_MACH_DB88F6281_BP is not set +# CONFIG_MACH_DLINK_KIRKWOOD_DT is not set +CONFIG_MACH_DOCKSTAR=y +# CONFIG_MACH_DOCKSTAR_DT is not set +# CONFIG_MACH_DREAMPLUG_DT is not set +CONFIG_MACH_ESATA_SHEEVAPLUG=y
[OpenWrt-Devel] [PATCH 4/5] [kirkwood]: Add generic profile
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- target/linux/kirkwood/profiles/100-Generic.mk | 19 +++ 1 file changed, 19 insertions(+) create mode 100644 target/linux/kirkwood/profiles/100-Generic.mk diff --git a/target/linux/kirkwood/profiles/100-Generic.mk b/target/linux/kirkwood/profiles/100-Generic.mk new file mode 100644 index 000..7bfb4aa --- /dev/null +++ b/target/linux/kirkwood/profiles/100-Generic.mk @@ -0,0 +1,19 @@ +# +# Copyright (C) 2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Generic + NAME:=Generic (default) + PACKAGES:=kmod-mmc kmod-mvsdio kmod-usb2 kmod-usb-storage \ + kmod-of-i2c kmod-i2c-core kmod-i2c-mv64xxx \ + kmod-rtc-marvell +endef + +define Profile/Generic/Description + Package set compatible with most Marvell Kirkwood based boards +endef +$(eval $(call Profile,Generic)) + -- 1.8.1.2 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/2] mpc85xx: Add Gianfar PTP as a module
PTP for gianfar can be built as a module. Add device tree entry to P1010RDB to enable ptp as pps clock. Clock timings are not tested. Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- package/kernel/modules/other.mk | 17 + .../patches-3.7/140-p1010rdb-dts-ptp-timer.patch | 17 + 2 files changed, 34 insertions(+) create mode 100644 target/linux/mpc85xx/patches-3.7/140-p1010rdb-dts-ptp-timer.patch diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index f63d670..1bdda0d 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -636,3 +636,20 @@ define KernelPacakge/ptp/description endef $(eval $(call KernelPackage,ptp)) + +define KernelPackage/ptp-gianfar + SUBMENU:=$(OTHER_MENU) + TITLE:=Freescale Gianfar PTP support + DEPENDS:=@TARGET_mpc85xx +kmod-gianfar +kmod-ptp + KCONFIG:=CONFIG_PTP_1588_CLOCK_GIANFAR + FILES:= \ + $(LINUX_DIR)/drivers/net/ethernet/freescale/gianfar_ptp.ko + AUTOLOAD:=$(call AutoLoad,51,gianfar_ptp) +endef + +define KernelPacakge/ptp-gianfar/description + Kenrel module for IEEE 1588 support for Freescale + Gianfar Ethernet drivers. +endef + +$(eval $(call KernelPackage,ptp-gianfar)) diff --git a/target/linux/mpc85xx/patches-3.7/140-p1010rdb-dts-ptp-timer.patch b/target/linux/mpc85xx/patches-3.7/140-p1010rdb-dts-ptp-timer.patch new file mode 100644 index 000..3076b35 --- /dev/null +++ b/target/linux/mpc85xx/patches-3.7/140-p1010rdb-dts-ptp-timer.patch @@ -0,0 +1,17 @@ +--- a/arch/powerpc/boot/dts/p1010rdb.dtsi 2012-11-21 12:21:21.320508226 +0100 b/arch/powerpc/boot/dts/p1010rdb.dtsi 2012-11-21 12:41:53.688342303 +0100 +@@ -256,4 +293,13 @@ + tbi-handle = tbi1; + phy-connection-type = sgmii; + }; ++ ++ ptp_timer: ptimer@b0e00 { ++ compatible = fsl,gianfar-ptp-timer; ++ reg = 0xb0e00 0xb0; ++ interrupts = 68 2 69 2 70 2; ++ interrupt-parent = mpic; ++ tmr-prsc = 0x2; ++ cksel = 1; ++ }; + }; + -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] kernel: Add Freescale Gianfar driver as a module
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- package/kernel/modules/netdevices.mk | 34 ++ 1 file changed, 34 insertions(+) diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index aec4948..df4d571 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -678,3 +678,37 @@ define KernelPackage/forcedeth/description endef $(eval $(call KernelPackage,forcedeth)) + +define KernelPackage/of-mdio + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=OpenFirmware MDIO support + DEPENDS:=+kmod-libphy + KCONFIG:=CONFIG_OF_MDIO + FILES:=$(LINUX_DIR)/drivers/of/of_mdio.ko + AUTOLOAD:=$(call AutoLoad,41,of_mdio) +endef + +define KernelPackage/of-mdio/description + Kernel driver for OpenFirmware MDIO support +endef + +$(eval $(call KernelPackage,of-mdio)) + +define KernelPackage/gianfar + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Gianfar Ethernet support + DEPENDS:=@TARGET_mpc85xx +kmod-of-mdio + KCONFIG:= \ + CONFIG_GIANFAR \ + CONFIG_FSL_PQ_MDIO + FILES:= \ + $(LINUX_DIR)/drivers/net/ethernet/freescale/gianfar_driver.ko \ + $(LINUX_DIR)/drivers/net/ethernet/freescale/fsl_pq_mdio.ko + AUTOLOAD:=$(call AutoLoad,50,fsl_pq_mdio gianfar_driver) +endef + +define KernelPackage/gianfar/description + Kernel driver for Freescale Gianfar Ethernet support +endef + +$(eval $(call KernelPackage,gianfar)) -- 1.7.10.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/2] mpc85xx: Add Gianfar PTP as a module
On 02/20/2013 08:15 PM, Gabor Juhos wrote: 2013.02.20. 9:14 keltezéssel, Wojciech Dubowik írta: PTP for gianfar can be built as a module. This part is applied with minor changes. Add device tree entry to P1010RDB to enable ptp as pps clock. However I have skipped this part. Clock timings are not tested. Please resend it as a spearate patch once you have verified that it is working correctly. More comments below. Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com ... diff --git a/target/linux/mpc85xx/patches-3.7/140-p1010rdb-dts-ptp-timer.patch b/target/linux/mpc85xx/patches-3.7/140-p1010rdb-dts-ptp-timer.patch new file mode 100644 index 000..3076b35 --- /dev/null +++ b/target/linux/mpc85xx/patches-3.7/140-p1010rdb-dts-ptp-timer.patch @@ -0,0 +1,17 @@ +--- a/arch/powerpc/boot/dts/p1010rdb.dtsi 2012-11-21 12:21:21.320508226 +0100 b/arch/powerpc/boot/dts/p1010rdb.dtsi 2012-11-21 12:41:53.688342303 +0100 +@@ -256,4 +293,13 @@ + tbi-handle = tbi1; + phy-connection-type = sgmii; + }; ++ ++ ptp_timer: ptimer@b0e00 { ++ compatible = fsl,gianfar-ptp-timer; Which driver uses this compatible property? The gianfar_ptp module (in kernel 3.7.9) does not handle this. I have copied this snippet from wrong patch... Sorry for that. The one I have used in testing was: --- a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi @@ -165,6 +165,18 @@ sdhci,auto-cmd12; }; +ptp_clock@b0e00 { +compatible = fsl,etsec-ptp; +reg = 0xb0e00 0xb0; +interrupts = 68 2 0 0 69 2 0 0 70 2 0 0; +fsl,tclk-period = 10; +fsl,tmr-prsc= 0x2; +fsl,tmr-add = 0x99A4; +fsl,tmr-fiper1 = 0x3B9AC9F6; +fsl,tmr-fiper2 = 0x00018696; +fsl,max-adj = 65998; +}; + /include/ pq3-sec4.4-0.dtsi /include/ pq3-mpic.dtsi /include/ pq3-mpic-timer-B.dtsi It's still not verified but I don't have time for that now so maybe you can skip it anyway. Wojtek -Gabor ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2][RFC] uboot-kirkwood: upgrade to 2012.04.01
On 06/27/2012 04:11 PM, Luka Perkov wrote: Hi Wojciech, On Wed, Jun 27, 2012 at 02:17:32PM +0200, Wojciech Dubowik wrote: I have tested it on iconnect and it works from NAND. Older version used to work from openocd but new one doesn't. Can you please explain how did you test old version with OpenOCD? I have used attached board config for openocd. Just use iconnect_load_uboot function after connecting the board. As far as I know, u-boot shouldn't work becasue you need to set sys base so that it doesn't relocate. Maybe new one works differently and you need to recompile it with different sys base or some other compile flag. I could have a look but at the moment I am really busy. Br, Wojtek Maybe there is problem somewhere in configuration. U-Boot 2012.04.01 (Jun 27 2012 - 14:11:30) Iomega iConnect Wireless SoC: Kirkwood 88F6281_A0 DRAM: 256 MiB WARNING: Caches not enabled NAND: 512 MiB In:serial Out: serial Err: serial Net: egiga0 Hit any key to stop autoboot: 0 iconnect = ping 192.168.1.3 Using egiga0 device host 192.168.1.3 is alive iconnect = reset resetting ... Thank you for testing. We'll do something about the upgrade soon. Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel # iomega Iconnect # based on sheevaplug/dockstar source [find target/feroceon.cfg] jtag_rclk 6000 $_TARGETNAME configure \ -work-area-phys 0x1000 \ -work-area-size 65536 \ -work-area-backup 0 # Disabled for the dockstar #arm7_9 dcc_downloads enable # this assumes the hardware default peripherals location before u-Boot moves it set _FLASHNAME $_CHIPNAME.flash nand device $_FLASHNAME orion 0 0xd800 proc iconnect_init { } { # We need to assert DBGRQ while holding nSRST down. # However DBGACK will be set only when nSRST is released. # Furthermore, the JTAG interface doesn't respond at all when # the CPU is in the WFI (wait for interrupts) state, so it is # possible that initial tap examination failed. So let's # re-examine the target again here when nSRST is asserted which # should then succeed. jtag_reset 0 1 feroceon.cpu arp_examine halt 0 jtag_reset 0 0 wait_halt arm mcr 15 0 0 1 0 0x00052078 #iconnect mww phys 0xD0001400 0x43000400 mww phys 0xD0001404 0x36343040 mww phys 0xD0001408 0x1101333b mww phys 0xD000140C 0x0034 mww phys 0xD0001410 0x00cc mww phys 0xD0001414 0x mww phys 0xD0001418 0x mww phys 0xD000141C 0x0642 mww phys 0xD0001420 0x0004 mww phys 0xD0001424 0xF07F mww phys 0xD0001428 0x00074410 mww phys 0xD000147c 0x7441 # 1st bank is 128 MB mww phys 0xD0001504 0x07F1 # 2nd bank is 128 MB mww phys 0xD0001508 0x1000 mww phys 0xD000150C 0x07F5 mww phys 0xD0001514 0x mww phys 0xD000151C 0x mww phys 0xD0001494 0x00120012 mww phys 0xD0001498 0x mww phys 0xD000149C 0xE40F mww phys 0xD0001480 0x0001 mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD0020204 0x mww phys 0xD001 0x0111 mww phys 0xD0010004 0x3322 mww phys 0xD0010008 0x mww phys 0xD0010418 0x003E07CF mww phys 0xD001041C 0x000F0F0F mww phys 0xD0010470 0x01C7D941 } proc iconnect_load_uboot
Re: [OpenWrt-Devel] [PATCH v2][RFC] uboot-kirkwood: upgrade to 2012.04.01
On 06/15/2012 12:41 AM, Luka Perkov wrote: On Tue, Jun 12, 2012 at 12:34:55AM +0200, Martin Mueller wrote: DockStar printenv baudrate=115200 bootargs=console=ttyS0,115200 mtdparts=orion_nand:1M(u-boot),4M@2M(kernel),32M@4M(rootfs),219M@37M(data) rw root=/dev/mtdblock2 rw rootfstype=jffs2 bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro bootcmd=nand read 0x640 0x20 0x40; bootm 0x640; bootdelay=3 console=console=ttyS0,115200 ethact=egiga0 initrd=/boot/uInitrd kernel=/boot/uImage mtdids=nand0=orion_nand mtdparts=mtdparts=orion_nand:1m(uboot),-(root) stderr=serial stdin=serial stdout=serial I have added this patch to the list of patches. It preserves config from current uboot in trunk. Now we just need to wait for iconnect test results. I have tested it on iconnect and it works from NAND. Older version used to work from openocd but new one doesn't. Maybe there is problem somewhere in configuration. U-Boot 2012.04.01 (Jun 27 2012 - 14:11:30) Iomega iConnect Wireless SoC: Kirkwood 88F6281_A0 DRAM: 256 MiB WARNING: Caches not enabled NAND: 512 MiB In:serial Out: serial Err: serial Net: egiga0 Hit any key to stop autoboot: 0 iconnect = ping 192.168.1.3 Using egiga0 device host 192.168.1.3 is alive iconnect = reset resetting ... Br, Wojtek Luka package/uboot-kirkwood/patches/110-dockstar.patch: --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -83,22 +83,19 @@ * Default environment variables */ #define CONFIG_BOOTCOMMAND \ - setenv bootargs ${console} ${mtdparts} ${bootargs_root};\ - ubi part root; \ - ubifsmount root; \ - ubifsload 0x80 ${kernel}; \ - ubifsload 0x110 ${initrd}; \ - bootm 0x80 0x110 + ${x_bootcmd_kernel};\ + setenv bootargs ${x_bootargs} ${x_bootargs_root}; \ + ${x_bootcmd_usb}; bootm 0x640; -#define CONFIG_MTDPARTS mtdparts=orion_nand:1m(uboot),-(root)\0 +#define CONFIG_MTDPARTS \ + orion_nand:1M(u-boot),1M@1M(second_stage_u-boot), \ + 3M@2M(kernel),32M@5M(rootfs),219M@37M(data) rw\0 #define CONFIG_EXTRA_ENV_SETTINGS \ - console=console=ttyS0,115200\0 \ - mtdids=nand0=orion_nand\0 \ - mtdparts=CONFIG_MTDPARTS \ - kernel=/boot/uImage\0 \ - initrd=/boot/uInitrd\0 \ - bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0 + x_bootargs=console=ttyS0,115200 mtdparts=CONFIG_MTDPARTS\ + x_bootcmd_kernel=nand read 0x640 0x20 0x30\0\ + x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0 \ + x_bootcmd_usb=usb start\0 /* * Ethernet Driver configuration ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [Projekt-wlan] Freescale P1020 WLAN support
Hello, On 03/28/2012 09:08 AM, Wojciech Dubowik wrote: Unless somebody else wants to do it I will try to consolidate the patches for mpc85xx and post for review. Do you have any progress? I am working at the moment on P1020WLAN dts file. I have now eth0 and eth1 working but there are still some things I don't quite understand i.e. when I map eTsec3 to eth2 in dts it shows as eth1 in linux. On the other hand maybe it's good so. I will post patches today or tomorrow once I have them cleaned up. Status: * upgraded kernel of mpc85xx to 3.3 * added watchdog module makefile * p1010 rdb support * p1020wlan support * rtc clock on p1010 TODO: * flash layouts for future support of sysupgrade * nand flash support for p1010 and p1020 * rtc clock on p1020 * figure out why autonegotiation takes so long on p1020wlan * mac id mappings from u-boot to linux, atm mac's of eth2 and eth1 are swapped Wojtek Hopefully P1020WLAN dts file won't take too long so I can do it this week. Do you need the official Freescale patches for the P1020rdb board? I have all released and public sdk. Or at least I think so. Thanks. Greetings, Rainer ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/7] mpc85xx: Add support for P1010RDB board Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com
--- target/linux/mpc85xx/image/Makefile|6 +- .../mpc85xx/patches/200-p1010-dts-typo-fix.patch | 11 +++ .../mpc85xx/patches/210-p1010-flash-layout.patch | 85 target/linux/mpc85xx/profiles/100-mpc854x.mk | 17 target/linux/mpc85xx/profiles/200-p1010rdb.mk | 17 5 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 target/linux/mpc85xx/patches/200-p1010-dts-typo-fix.patch create mode 100644 target/linux/mpc85xx/patches/210-p1010-flash-layout.patch create mode 100644 target/linux/mpc85xx/profiles/100-mpc854x.mk create mode 100644 target/linux/mpc85xx/profiles/200-p1010rdb.mk diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile index a5d1acb..1d2ac85 100644 --- a/target/linux/mpc85xx/image/Makefile +++ b/target/linux/mpc85xx/image/Makefile @@ -7,15 +7,17 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -DTS_TARGETS = mpc8548cds +DTS_TARGETS = mpc8548cds p1010rdb define Image/Prepare cp $(LINUX_DIR)/arch/powerpc/boot/zImage $(KDIR)/zImage + cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(KDIR)/uImage endef define Image/BuildKernel cp $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage - $(foreach dts,$(DTS_TARGETS),$(LINUX_DIR)/scripts/dtc/dtc -I dts -O dtb $(LINUX_DIR)/arch/powerpc/boot/dts/$(dts).dts $(BIN_DIR)/$(IMG_PREFIX)-$(dts).fdt) + cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage + $(foreach dts,$(DTS_TARGETS),$(LINUX_DIR)/scripts/dtc/dtc -I dts -O dtb $(LINUX_DIR)/arch/powerpc/boot/dts/$(dts).dts $(BIN_DIR)/$(IMG_PREFIX)-$(dts).fdt;) endef define Image/Build/ext2 diff --git a/target/linux/mpc85xx/patches/200-p1010-dts-typo-fix.patch b/target/linux/mpc85xx/patches/200-p1010-dts-typo-fix.patch new file mode 100644 index 000..ca8968e --- /dev/null +++ b/target/linux/mpc85xx/patches/200-p1010-dts-typo-fix.patch @@ -0,0 +1,11 @@ +--- a/arch/powerpc/boot/dts/p1010rdb.dtsi b/arch/powerpc/boot/dts/p1010rdb.dtsi +@@ -196,7 +196,7 @@ + }; + + tbi-phy@3 { +- device-type = tbi-phy; ++ device_type = tbi-phy; + reg = 0x3; + }; + }; diff --git a/target/linux/mpc85xx/patches/210-p1010-flash-layout.patch b/target/linux/mpc85xx/patches/210-p1010-flash-layout.patch new file mode 100644 index 000..6101628 --- /dev/null +++ b/target/linux/mpc85xx/patches/210-p1010-flash-layout.patch @@ -0,0 +1,85 @@ +Index: linux-3.3/arch/powerpc/boot/dts/p1010rdb.dtsi +=== +--- linux-3.3.orig/arch/powerpc/boot/dts/p1010rdb.dtsi 2012-03-20 08:05:17.933326897 +0100 linux-3.3/arch/powerpc/boot/dts/p1010rdb.dtsi 2012-03-20 08:12:32.520395523 +0100 +@@ -44,19 +44,19 @@ + partition@4 { + /* 256KB for DTB Image */ + reg = 0x0004 0x0004; +- label = NOR DTB Image; ++ label = dtb; + }; + + partition@8 { + /* 7 MB for Linux Kernel Image */ + reg = 0x0008 0x0070; +- label = NOR Linux Kernel Image; ++ label = linux; + }; + + partition@80 { + /* 20MB for JFFS2 based Root file System */ + reg = 0x0080 0x0140; +- label = NOR JFFS2 Root File System; ++ label = rootfs; + }; + + partition@1f0 { +@@ -64,7 +64,7 @@ + /* 512KB for u-boot Bootloader Image */ + /* 512KB for u-boot Environment Variables */ + reg = 0x01f0 0x0010; +- label = NOR U-Boot Image; ++ label = u-boot; + read-only; + }; + }; +@@ -144,32 +144,32 @@ + /* 1MB for u-boot Bootloader Image */ + /* 1MB for Environment */ + reg = 0x0 0x0010; +- label = SPI Flash U-Boot Image; ++ label = u-boot; + read-only; + }; + + partition@10 { +- /* 512KB for DTB Image */ +- reg = 0x0010 0x0008; +- label = SPI Flash DTB Image; ++ /* 64KB U-boot env */ ++ reg = 0x0010 0x0001; ++ label = u-boot env; + }; + +- partition@18 { +- /* 4MB for Linux Kernel Image */ +-
[OpenWrt-Devel] [PATCH 6/7] mpc85xx: Add module for Pericom RTC chip present on P1010RDB board Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com
--- target/linux/mpc85xx/profiles/200-p1010rdb.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target/linux/mpc85xx/profiles/200-p1010rdb.mk b/target/linux/mpc85xx/profiles/200-p1010rdb.mk index 9d67080..b7593a3 100644 --- a/target/linux/mpc85xx/profiles/200-p1010rdb.mk +++ b/target/linux/mpc85xx/profiles/200-p1010rdb.mk @@ -7,7 +7,7 @@ define Profile/p1010rdb NAME:=Freescael P1010RDB Reference Board - PACKAGES:=kmod-booke-wdt + PACKAGES:=kmod-booke-wdt kmod-i2c-mpc kmod-rtc-pt7c4338 endef define Profile/p1010rdb/Description -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 0/7] mpc85xx: P1010RDB and P1020WLAN support
These patches upgrade kernel to 3.3 and add board support for P1010RDB and P1020WLAN reference designs from Freescale. Known issues: * long autonegotiation times for phys on P1020WLAN * flash layouts on P1020WLAN are finished * ethernet mappings for P1020WLAN needs to be cleaned up but it will require override standard fsl include files for dts * P1010RDB has problems with interrupts on one of pcie slots This issue is already present on official reference desgin. * RTC clock on P1020WLAN needs driver (DS1339) * not all memory is visible on P1020WLAN (768M form 1G). Not sure whether it's normal or not. * details... Wojciech Dubowik (7): mpc85xx: Upgrade kernel to version 3.3 Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com mpc85xx: Add support for P1010RDB board Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com kernel: Add i2c module support for Freescale MPC processors Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com kernel: Add support for Pericom PT7C4338 I2C RTC chip Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com mpc85xx: Add kernel module for watchdog Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com mpc85xx: Add module for Pericom RTC chip present on P1010RDB board Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com mpc85xx: Add support for Freescale P1020WLAN reference design. package/kernel/modules/i2c.mk | 18 ++- package/kernel/modules/other.mk| 14 + target/linux/generic/config-3.3|2 + .../generic/patches-3.3/841-rtc_pt7c4338.patch | 253 + target/linux/mpc85xx/Makefile |2 +- target/linux/mpc85xx/config-default| 98 --- target/linux/mpc85xx/image/Makefile|6 +- target/linux/mpc85xx/modules.mk| 21 ++ .../mpc85xx/patches/100-fix_mpc8568e_mds.patch | 82 ++ .../mpc85xx/patches/110-fix_mpc8548_cds.patch | 68 +++-- .../patches/120-mpc8548_cds_i8259_noirq_init.patch |8 +- .../130-mpc8548_cds_disable_i8259_irq.patch| 10 +- .../mpc85xx/patches/200-p1010-dts-typo-fix.patch | 11 + .../mpc85xx/patches/210-p1010-flash-layout.patch | 85 ++ .../linux/mpc85xx/patches/230-p1020wlan-dts.patch | 300 target/linux/mpc85xx/profiles/100-mpc854x.mk | 17 ++ target/linux/mpc85xx/profiles/200-p1010rdb.mk | 17 ++ target/linux/mpc85xx/profiles/201-p1020wlan.mk | 17 ++ 18 files changed, 898 insertions(+), 131 deletions(-) create mode 100644 target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch create mode 100644 target/linux/mpc85xx/modules.mk create mode 100644 target/linux/mpc85xx/patches/200-p1010-dts-typo-fix.patch create mode 100644 target/linux/mpc85xx/patches/210-p1010-flash-layout.patch create mode 100644 target/linux/mpc85xx/patches/230-p1020wlan-dts.patch create mode 100644 target/linux/mpc85xx/profiles/100-mpc854x.mk create mode 100644 target/linux/mpc85xx/profiles/200-p1010rdb.mk create mode 100644 target/linux/mpc85xx/profiles/201-p1020wlan.mk -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/7] kernel: Add i2c module support for Freescale MPC processors Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com
--- package/kernel/modules/i2c.mk | 18 +- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 0d525cc..d2b45d6 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -143,7 +143,8 @@ OF_I2C_MODULES:=\ define KernelPackage/of-i2c $(call i2c_defaults,$(OF_I2C_MODULES),58) TITLE:=OpenFirmware I2C accessors - DEPENDS:=@TARGET_ppc40x||TARGET_ppc4xx kmod-i2c-core + DEPENDS:=@TARGET_ppc40x||TARGET_ppc4xx||TARGET_mpc52xx||TARGET_mpc83xx||TARGET_mpc85xx \ + kmod-i2c-core endef define KernelPackage/of-i2c/description @@ -152,6 +153,21 @@ endef $(eval $(call KernelPackage,of-i2c)) +I2C_MPC_MODULES:=\ + CONFIG_I2C_MPC:drivers/i2c/busses/i2c-mpc + +define KernelPackage/i2c-mpc + $(call i2c_defaults,$(I2C_MPC_MODULES),59) + TITLE:=MPC I2C accessors + DEPENDS:=@TARGET_mpc52xx||TARGET_mpc83xx||TARGET_mpc85xx \ + +kmod-i2c-core +kmod-of-i2c +endef + +define KernelPackage/i2c-mpc/description + Kernel module for Freescale MPC52xx MPC83xx MPC85xx I2C accessors. +endef + +$(eval $(call KernelPackage,i2c-mpc)) I2C_IBM_IIC_MODULES:=\ CONFIG_I2C_IBM_IIC:drivers/i2c/busses/i2c-ibm_iic -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/7] mpc85xx: Upgrade kernel to version 3.3 Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com
--- target/linux/generic/config-3.3|1 + target/linux/mpc85xx/Makefile |2 +- target/linux/mpc85xx/config-default| 66 +--- .../mpc85xx/patches/100-fix_mpc8568e_mds.patch | 82 +++- .../mpc85xx/patches/110-fix_mpc8548_cds.patch | 68 + .../patches/120-mpc8548_cds_i8259_noirq_init.patch |8 +- .../130-mpc8548_cds_disable_i8259_irq.patch| 10 ++- 7 files changed, 116 insertions(+), 121 deletions(-) diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3 index 8cdc693..ae0cf16 100644 --- a/target/linux/generic/config-3.3 +++ b/target/linux/generic/config-3.3 @@ -440,6 +440,7 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_CTS is not set # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_DEV_FSL_CAAM is not set # CONFIG_CRYPTO_DEV_HIFN_795X is not set # CONFIG_CRYPTO_DEV_MV_CESA is not set # CONFIG_CRYPTO_DEV_TALITOS is not set diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 3543438..91d608c 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=8540 FEATURES:=spe_fpu ramdisk MAINTAINER:=Imre Kaloz ka...@openwrt.org -LINUX_VERSION:=2.6.38.8 +LINUX_VERSION:=3.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default index 7aedd52..0d1b31e 100644 --- a/target/linux/mpc85xx/config-default +++ b/target/linux/mpc85xx/config-default @@ -4,21 +4,21 @@ # CONFIG_ARCH_DMA_ADDR_T_64BIT is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_ARCH_HAS_ILOG2_U32=y CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y # CONFIG_ARCH_NO_VIRT_TO_BUS is not set # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_AUDIT_ARCH=y -# CONFIG_AUTO_IRQ_AFFINITY is not set -CONFIG_BKL=y +CONFIG_BCMA_POSSIBLE=y CONFIG_BOOKE=y CONFIG_BOUNCE=y CONFIG_CMDLINE=console=ttyS0,115200 @@ -35,13 +35,11 @@ CONFIG_E500=y CONFIG_EARLY_PRINTK=y CONFIG_ELF_CORE=y CONFIG_ENABLE_MUST_CHECK=y -CONFIG_EXPERT=y -CONFIG_FREEZER=y +# CONFIG_EPAPR_BOOT is not set CONFIG_FSL_BOOKE=y CONFIG_FSL_EMB_PERFMON=y CONFIG_FSL_LBC=y CONFIG_FSL_PCI=y -CONFIG_FSL_PMC=y CONFIG_FSL_PQ_MDIO=y CONFIG_FSL_SOC=y CONFIG_FSL_SOC_BOOKE=y @@ -51,27 +49,26 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_GENERIC_FIND_NEXT_BIT=y +# CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_GPIO=y -# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set -# CONFIG_GENERIC_IOMAP is not set -# CONFIG_GENERIC_IRQ_PROBE is not set +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_NVRAM=y -# CONFIG_GENERIC_PENDING_IRQ is not set +CONFIG_GENERIC_PCI_IOMAP=y # CONFIG_GENERIC_TBSYNC is not set CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GEN_RTC=y # CONFIG_GEN_RTC_X is not set CONFIG_GIANFAR=y CONFIG_GPIOLIB=y +CONFIG_GPIO_MPC8XXX=y # CONFIG_HAMRADIO is not set -# CONFIG_HARDIRQS_SW_RESEND is not set CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_RAPIDIO=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_API_DEBUG=y @@ -88,22 +85,22 @@ CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_IRQ_WORK=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set CONFIG_HAVE_SPARSE_IRQ=y -# CONFIG_HIBERNATION is not set +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HZ=250 # CONFIG_HZ_100 is not set CONFIG_HZ_250=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y CONFIG_INITRAMFS_SOURCE= -CONFIG_INOTIFY_USER=y CONFIG_IOMMU_HELPER=y # CONFIG_IPIC is not set -CONFIG_IRQ_PER_CPU=y +CONFIG_IRQ_FORCED_THREADING=y CONFIG_ISA_DMA_API=y CONFIG_KERNEL_START=0xc000 # CONFIG_KSI8560 is not set @@ -113,11 +110,12 @@ CONFIG_LEGACY_PTY_COUNT=256 CONFIG_LOWMEM_CAM_NUM=3 CONFIG_LOWMEM_SIZE=0x3000 CONFIG_LXT_PHY=y -CONFIG_MACH_NO_WESTBRIDGE=y # CONFIG_MATH_EMULATION is not set CONFIG_MAX_ACTIVE_REGIONS=32 +CONFIG_MDIO_BOARDINFO=y CONFIG_MIGRATION=y # CONFIG_MII is not set +# CONFIG_MLX4_CORE is not set # CONFIG_MMIO_NVRAM is not set # CONFIG_MPC8536_DS is not set # CONFIG_MPC8540_ADS is not set @@ -126,7 +124,6 @@ CONFIG_MPC85xx_CDS=y # CONFIG_MPC85xx_DS is not set
[OpenWrt-Devel] [PATCH 4/7] kernel: Add support for Pericom PT7C4338 I2C RTC chip Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com
--- package/kernel/modules/other.mk| 14 + .../generic/patches-3.3/841-rtc_pt7c4338.patch | 253 2 files changed, 267 insertions(+), 0 deletions(-) create mode 100644 target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index abac481..1a5a2e8 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -810,6 +810,20 @@ endef $(eval $(call KernelPackage,rtc-pcf2123)) +define KernelPackage/rtc-pt7c4338 + SUBMENU:=$(OTHER_MENU) + TITLE:=Pericom PT7C4338 RTC support + $(call AddDepends/rtc,+kmod-i2c-core) + KCONFIG:=CONFIG_RTC_DRV_PT7C4338 + FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pt7c4338.ko + AUTOLOAD:=$(call AutoLoad,60,rtc-pt7c4338) +endef + +define KernelPackage/rtc-pt7c4338/description + Kernel module for Pericom PT7C4338 i2c RTC chip. +endef + +$(eval $(call KernelPackage,rtc-pt7c4338)) define KernelPackage/n810bm SUBMENU:=$(OTHER_MENU) diff --git a/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch b/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch new file mode 100644 index 000..ac41528 --- /dev/null +++ b/target/linux/generic/patches-3.3/841-rtc_pt7c4338.patch @@ -0,0 +1,253 @@ +Index: linux-3.3/drivers/rtc/Kconfig +=== +--- linux-3.3.orig/drivers/rtc/Kconfig 2012-03-20 07:52:18.838582040 +0100 linux-3.3/drivers/rtc/Kconfig 2012-03-20 07:52:19.228579409 +0100 +@@ -379,6 +379,15 @@ + This driver can also be built as a module. If so, the module + will be called rtc-rv3029c2. + ++config RTC_DRV_PT7C4338 ++ tristate Pericom Technology Inc. PT7C4338 RTC ++ help ++If you say yes here you get support for the Pericom Technology ++Inc. PT7C4338 RTC chip. ++ ++This driver can also be built as a module. If so, the module ++will be called rtc-pt7c4338. ++ + endif # I2C + + comment SPI RTC drivers +Index: linux-3.3/drivers/rtc/Makefile +=== +--- linux-3.3.orig/drivers/rtc/Makefile2012-03-20 07:52:18.838582040 +0100 linux-3.3/drivers/rtc/Makefile 2012-03-20 07:52:19.228579409 +0100 +@@ -79,6 +79,7 @@ + obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o + obj-$(CONFIG_RTC_DRV_PM8XXX) += rtc-pm8xxx.o + obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.o ++obj-$(CONFIG_RTC_DRV_PT7C4338)+= rtc-pt7c4338.o + obj-$(CONFIG_RTC_DRV_PUV3)+= rtc-puv3.o + obj-$(CONFIG_RTC_DRV_PXA) += rtc-pxa.o + obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o +Index: linux-3.3/drivers/rtc/rtc-pt7c4338.c +=== +--- /dev/null 1970-01-01 00:00:00.0 + linux-3.3/drivers/rtc/rtc-pt7c4338.c 2012-03-20 07:52:19.228579409 +0100 +@@ -0,0 +1,216 @@ ++/* ++ * Copyright 2010 Freescale Semiconductor, Inc. ++ * ++ * Author:Priyanka Jain priyanka.j...@freescale.com ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * 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 Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++/* ++ * This file provides Date Time support (no alarms) for PT7C4338 chip. ++ * ++ * This file is based on drivers/rtc/rtc-ds1307.c ++ * ++ * PT7C4338 chip is manufactured by Pericom Technology Inc. ++ * It is a serial real-time clock which provides ++ * 1)Low-power clock/calendar. ++ * 2)Programmable square-wave output. ++ * It has 56 bytes of nonvolatile RAM. ++ */ ++ ++#include linux/kernel.h ++#include linux/module.h ++#include linux/slab.h ++#include linux/i2c.h ++#include linux/rtc.h ++#include linux/bcd.h ++ ++/* RTC register addresses */ ++#define PT7C4338_REG_SECONDS 0x00 ++#define PT7C4338_REG_MINUTES 0x01 ++#define PT7C4338_REG_HOURS0x02 ++#define PT7C4338_REG_AMPM 0x02 ++#define PT7C4338_REG_DAY 0x03 ++#define PT7C4338_REG_DATE 0x04 ++#define PT7C4338_REG_MONTH0x05 ++#define PT7C4338_REG_YEAR 0x06 ++#define PT7C4338_REG_CTRL_STAT0x07 ++ ++/* RTC second register address bit */ ++#define PT7C4338_SEC_BIT_CH 0x80/*Clock Halt (in Register 0)*/ ++ ++/* RTC control
[OpenWrt-Devel] [PATCH 5/7] mpc85xx: Add kernel module for watchdog Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com
--- target/linux/generic/config-3.3 |1 + target/linux/mpc85xx/config-default |4 ++-- target/linux/mpc85xx/modules.mk | 21 + target/linux/mpc85xx/profiles/100-mpc854x.mk |2 +- target/linux/mpc85xx/profiles/200-p1010rdb.mk |2 +- 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 target/linux/mpc85xx/modules.mk diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3 index ae0cf16..ed1c9b4 100644 --- a/target/linux/generic/config-3.3 +++ b/target/linux/generic/config-3.3 @@ -274,6 +274,7 @@ CONFIG_BLOCK=y # CONFIG_BNX2 is not set # CONFIG_BNX2X is not set # CONFIG_BONDING is not set +CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=38 # CONFIG_BOOT_PRINTK_DELAY is not set CONFIG_BOOT_RAW=y # CONFIG_BPQETHER is not set diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default index 0d1b31e..2a388fc 100644 --- a/target/linux/mpc85xx/config-default +++ b/target/linux/mpc85xx/config-default @@ -20,6 +20,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_AUDIT_ARCH=y CONFIG_BCMA_POSSIBLE=y CONFIG_BOOKE=y +# CONFIG_BOOKE_WDT is not set CONFIG_BOUNCE=y CONFIG_CMDLINE=console=ttyS0,115200 CONFIG_CMDLINE_BOOL=y @@ -146,7 +147,7 @@ CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y -# CONFIG_P1010_RDB is not set +CONFIG_P1010_RDB=y # CONFIG_P1022_DS is not set # CONFIG_P1023_RDS is not set # CONFIG_P2041_RDB is not set @@ -247,6 +248,5 @@ CONFIG_UCC_GETH=y CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB_SUPPORT=y CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_WATCHDOG is not set CONFIG_WORD_SIZE=32 # CONFIG_XES_MPC85xx is not set diff --git a/target/linux/mpc85xx/modules.mk b/target/linux/mpc85xx/modules.mk new file mode 100644 index 000..e94f983 --- /dev/null +++ b/target/linux/mpc85xx/modules.mk @@ -0,0 +1,21 @@ +# +# Copyright (C) 2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define KernelPackage/booke-wdt + SUBMENU:=$(OTHER_MENU) + TITLE:=PowerPC Book-E Watchdog Timer + DEPENDS:=@TARGET_mpc85xx + KCONFIG:=CONFIG_BOOKE_WDT + FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/booke_wdt.ko + AUTOLOAD:=$(call AutoLoad,50,booke_wdt) +endef + +define KernelPackage/booke-wdt/description + Kernel module for PowerPC Book-E Watchdog Timer. +endef + +$(eval $(call KernelPackage,booke-wdt)) \ No newline at end of file diff --git a/target/linux/mpc85xx/profiles/100-mpc854x.mk b/target/linux/mpc85xx/profiles/100-mpc854x.mk index dd2d396..3793a66 100644 --- a/target/linux/mpc85xx/profiles/100-mpc854x.mk +++ b/target/linux/mpc85xx/profiles/100-mpc854x.mk @@ -7,7 +7,7 @@ define Profile/mpc854x NAME:=MPC854x (default) - PACKAGES:= + PACKAGES:=kmod-booke-wdt endef define Profile/mpc8548/Description diff --git a/target/linux/mpc85xx/profiles/200-p1010rdb.mk b/target/linux/mpc85xx/profiles/200-p1010rdb.mk index fcc2d4a..9d67080 100644 --- a/target/linux/mpc85xx/profiles/200-p1010rdb.mk +++ b/target/linux/mpc85xx/profiles/200-p1010rdb.mk @@ -7,7 +7,7 @@ define Profile/p1010rdb NAME:=Freescael P1010RDB Reference Board - PACKAGES:= + PACKAGES:=kmod-booke-wdt endef define Profile/p1010rdb/Description -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 7/7] mpc85xx: Add support for Freescale P1020WLAN reference design.
* P1020WLAN RevD * SMP enabled kernel Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- target/linux/mpc85xx/config-default| 30 ++- target/linux/mpc85xx/image/Makefile|2 +- .../linux/mpc85xx/patches/230-p1020wlan-dts.patch | 300 target/linux/mpc85xx/profiles/201-p1020wlan.mk | 17 ++ 4 files changed, 342 insertions(+), 7 deletions(-) create mode 100644 target/linux/mpc85xx/patches/230-p1020wlan-dts.patch create mode 100644 target/linux/mpc85xx/profiles/201-p1020wlan.mk diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default index 2a388fc..8f3795c 100644 --- a/target/linux/mpc85xx/config-default +++ b/target/linux/mpc85xx/config-default @@ -15,7 +15,6 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_AUDIT_ARCH=y CONFIG_BCMA_POSSIBLE=y @@ -25,6 +24,7 @@ CONFIG_BOUNCE=y CONFIG_CMDLINE=console=ttyS0,115200 CONFIG_CMDLINE_BOOL=y # CONFIG_CPM2 is not set +CONFIG_CPU_RMAP=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DECOMPRESS_LZMA=y CONFIG_DEFAULT_UIMAGE=y @@ -44,7 +44,7 @@ CONFIG_FSL_PCI=y CONFIG_FSL_PQ_MDIO=y CONFIG_FSL_SOC=y CONFIG_FSL_SOC_BOOKE=y -# CONFIG_FSL_ULI1575 is not set +CONFIG_FSL_ULI1575=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -57,7 +57,7 @@ CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_NVRAM=y CONFIG_GENERIC_PCI_IOMAP=y -# CONFIG_GENERIC_TBSYNC is not set +CONFIG_GENERIC_TBSYNC=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GEN_RTC=y # CONFIG_GEN_RTC_X is not set @@ -89,6 +89,7 @@ CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_RCU_TABLE_FREE=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set CONFIG_HAVE_SPARSE_IRQ=y @@ -101,6 +102,7 @@ CONFIG_INET_TCP_DIAG=y CONFIG_INITRAMFS_SOURCE= CONFIG_IOMMU_HELPER=y # CONFIG_IPIC is not set +# CONFIG_IRQ_ALL_CPUS is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_ISA_DMA_API=y CONFIG_KERNEL_START=0xc000 @@ -124,16 +126,24 @@ CONFIG_MIGRATION=y CONFIG_MPC85xx_CDS=y # CONFIG_MPC85xx_DS is not set CONFIG_MPC85xx_MDS=y -# CONFIG_MPC85xx_RDB is not set +CONFIG_MPC85xx_RDB=y CONFIG_MPIC=y # CONFIG_MPIC_U3_HT_IRQS is not set # CONFIG_MPIC_WEIRD is not set -# CONFIG_MTD is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_FSL_ELBC=y +# CONFIG_MTD_OF_PARTS is not set +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +# CONFIG_MTD_SM_COMMON is not set +# CONFIG_MTD_WRSBC8260 is not set +CONFIG_MUTEX_SPIN_ON_OWNER=y # CONFIG_NEED_DMA_MAP_STATE is not set # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set -CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_SG_DMA_LENGTH=y # CONFIG_NONSTATIC_KERNEL is not set +CONFIG_NR_CPUS=4 CONFIG_NR_IRQS=512 CONFIG_OF=y CONFIG_OF_ADDRESS=y @@ -213,6 +223,8 @@ CONFIG_PROC_PAGE_MONITOR=y CONFIG_QE_GPIO=y CONFIG_QUICC_ENGINE=y # CONFIG_QUOTACTL is not set +CONFIG_RFS_ACCEL=y +CONFIG_RPS=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_SBC8548 is not set CONFIG_SBC8560=y @@ -229,9 +241,11 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SIMPLE_GPIO=y # CONFIG_SLAB is not set CONFIG_SLUB=y +CONFIG_SMP=y # CONFIG_SOCRATES is not set CONFIG_SPE=y # CONFIG_SQUASHFS is not set +CONFIG_STOP_MACHINE=y # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_STX_GP3 is not set CONFIG_SWIOTLB=y @@ -241,12 +255,16 @@ CONFIG_TASK_SIZE=0xc000 # CONFIG_TQM8548 is not set # CONFIG_TQM8555 is not set # CONFIG_TQM8560 is not set +CONFIG_TREE_RCU=y CONFIG_UCC=y CONFIG_UCC_FAST=y CONFIG_UCC_GETH=y # CONFIG_UGETH_TX_ON_DEMAND is not set CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB_SUPPORT=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_VITESSE_PHY=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_WORD_SIZE=32 # CONFIG_XES_MPC85xx is not set +CONFIG_XPS=y diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile index 1d2ac85..ec4da3f 100644 --- a/target/linux/mpc85xx/image/Makefile +++ b/target/linux/mpc85xx/image/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -DTS_TARGETS = mpc8548cds p1010rdb +DTS_TARGETS = mpc8548cds p1010rdb p1020wlan define Image/Prepare cp $(LINUX_DIR)/arch/powerpc/boot/zImage $(KDIR)/zImage diff --git a/target/linux/mpc85xx/patches/230-p1020wlan-dts.patch b/target/linux/mpc85xx/patches/230-p1020wlan-dts.patch new file mode 100644 index 000..9bbb36a --- /dev/null +++ b/target/linux/mpc85xx/patches/230-p1020wlan-dts.patch @@ -0,0 +1,300 @@ +--- /dev/null a/arch/powerpc/boot/dts/p1020wlan.dts +@@ -1,0 +1,65 @@ ++/* ++ * P1020 RDB Device Tree Source ++ * ++ * Copyright 2009-2011 Freescale Semiconductor Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify
Re: [OpenWrt-Devel] [Projekt-wlan] Freescale P1020 WLAN support
Hello, Unless somebody else wants to do it I will try to consolidate the patches for mpc85xx and post for review. I can test p1010 and p1020 on my side. The older mpc854x will be only compile tested. Hopefully P1020WLAN dts file won't take too long so I can do it this week. Wojtek - Original Message - Hey, On Tue, 27 Mar 2012 18:05:29 +0200, Rainer 'Rei' Schuth rainer.sch...@fem.tu-ilmenau.de wrote: On 03/27/2012 05:31 PM, Wojciech Dubowik wrote: Thank you, I would apply the patch and try to run OpenWRT on the P1020rdb. I let you know my experience. I don't have any older mpc85xx devices so I don't know whether they need patches with latest kernel or not. At the moment I have just removed them. The Freescale developer team make for the P1020rdb around 170 patches for the 2.6.32 Linux kernel. Many of them are meanwhile upstream but some are hardware hacks and driver changes. Its hard to say which patches really work and which don't without a working OS. If you have something basic up and running, I'm happy to review and (if needed) clean up the patches. Given how much I could nuke from the freescale patches previosly, you probably will be fine porting about 10 over from the 170 ;) Imre ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Freescale P1020 WLAN support
Hello, I have once got p1020 running with openwrt. It should basically work without any specific target patches. I had to only adapt image building script. I will give it a try with 3.3 kernel and let you know. Wojtek PS At the moment I am fighting with p1010 as I get some spurious interrupts on second pcie slot. Maybe somebody has experienced similar problems? - Original Message - Hi, is there currently anybody working on OpenWRT P1020-WLAN (Freescale) support? It is because we at the FeM e.V. are working on it trying to port the freescale patches forward and would like to join forces with anybody already working on it. Regards, M. Braun -- http://www.fem.tu-ilmenau.de/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Freescale P1020 WLAN support
I have just tried kernel 3.3 on p1020wlan and it seems to run with empty target patches folder. Only eth0 is working at the moment and most probably dts file has to be adapted slightly for eth1. What kind of other Freescale patches are you planning to port? Wojtek - Original Message - Hello, I have once got p1020 running with openwrt. It should basically work without any specific target patches. I had to only adapt image building script. I will give it a try with 3.3 kernel and let you know. Wojtek PS At the moment I am fighting with p1010 as I get some spurious interrupts on second pcie slot. Maybe somebody has experienced similar problems? - Original Message - Hi, is there currently anybody working on OpenWRT P1020-WLAN (Freescale) support? It is because we at the FeM e.V. are working on it trying to port the freescale patches forward and would like to join forces with anybody already working on it. Regards, M. Braun -- http://www.fem.tu-ilmenau.de/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [Projekt-wlan] Freescale P1020 WLAN support
So I have cooked sth up based on latest trunk. I have made mistake in my setup and I accidentally used p1010rdb device tree instead of p1020rdb and got eth0 to work ;o) Device tree for 1020WLAN needs some more work to get physical addresses right. Anyway the current image should run on WAN interface. I don't have any older mpc85xx devices so I don't know whether they need patches with latest kernel or not. At the moment I have just removed them. I have used following command for booting: setenv fdtfile openwrt-mpc85xx-p1020rdb.fdt setenv bootfile openwrt-mpc85xx-uImage setenv bootcmd 'run ramboot2' setenv ramboot2 'setenv bootargs root=/dev/ram rw console=$consoledev, $baudrate $othbootargs ramdisk_size=12;tftp $loadaddr $bootfile; tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr' and the patch From bd32a8f6c3e64ba787ab3f2214ae35a12ea8ad30 Mon Sep 17 00:00:00 2001 From: Wojciech Dubowik wojciech.dubo...@neratec.com Date: Tue, 27 Mar 2012 17:18:04 +0200 Subject: [PATCH 1/1] mpc85xx: Experimental support for Feeescale P1010RDB and P1020WLAN Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- target/linux/mpc85xx/Makefile |2 +- target/linux/mpc85xx/config-3.3| 255 target/linux/mpc85xx/image/Makefile|8 +- .../patches-3.3/200-p1020-dts-eth0-hack.patch | 47 .../patches-3.3/201-p1010-dts-typo-fix.patch | 11 + 5 files changed, 318 insertions(+), 5 deletions(-) create mode 100644 target/linux/mpc85xx/config-3.3 create mode 100644 target/linux/mpc85xx/patches-3.3/200-p1020-dts-eth0-hack.patch create mode 100644 target/linux/mpc85xx/patches-3.3/201-p1010-dts-typo-fix.patch diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index 3543438..91d608c 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=8540 FEATURES:=spe_fpu ramdisk MAINTAINER:=Imre Kaloz ka...@openwrt.org -LINUX_VERSION:=2.6.38.8 +LINUX_VERSION:=3.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc85xx/config-3.3 b/target/linux/mpc85xx/config-3.3 new file mode 100644 index 000..7c8adb6 --- /dev/null +++ b/target/linux/mpc85xx/config-3.3 @@ -0,0 +1,255 @@ +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_ADVANCED_OPTIONS is not set +# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_ARCH_NO_VIRT_TO_BUS is not set +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_AUDIT_ARCH=y +CONFIG_BCMA_POSSIBLE=y +CONFIG_BOOKE=y +CONFIG_BOUNCE=y +CONFIG_CMDLINE=console=ttyS0,115200 +CONFIG_CMDLINE_BOOL=y +# CONFIG_CPM2 is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DEFAULT_UIMAGE=y +CONFIG_DEVKMEM=y +CONFIG_DNOTIFY=y +CONFIG_DTC=y +# CONFIG_E200 is not set +CONFIG_E500=y +CONFIG_EARLY_PRINTK=y +CONFIG_ELF_CORE=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_EPAPR_BOOT is not set +CONFIG_FREEZER=y +CONFIG_FSL_BOOKE=y +CONFIG_FSL_EMB_PERFMON=y +CONFIG_FSL_LBC=y +CONFIG_FSL_PCI=y +CONFIG_FSL_PMC=y +CONFIG_FSL_PQ_MDIO=y +CONFIG_FSL_SOC=y +CONFIG_FSL_SOC_BOOKE=y +CONFIG_FSL_ULI1575=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CMOS_UPDATE=y +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_NVRAM=y +CONFIG_GENERIC_PCI_IOMAP=y +# CONFIG_GENERIC_TBSYNC is not set +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GEN_RTC=y +# CONFIG_GEN_RTC_X is not set +CONFIG_GIANFAR=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_MPC8XXX=y +# CONFIG_HAMRADIO is not set +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_RAPIDIO=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y +CONFIG_HAVE_IDE=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_IRQ_WORK=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +CONFIG_HAVE_SPARSE_IRQ=y
Re: [OpenWrt-Devel] [PATCH] [packages] owfs: Fix compilation on uClibc.
I haven't tested it but it should work. I might give it a try with eglibc. Wojtek - Original Message - Wouldn't this patch also be applied if you're compiling with glibc or eglibc? On 6/22/11 3:38 AM, Wojciech Dubowik wrote: By default RPC is disabled in uClibc. Removing rpc/netdb.h doesn't seem to have any impact on configured owfs applications. Fixes #9426 Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- utils/owfs/patches/001-compile-fix.patch | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 utils/owfs/patches/001-compile-fix.patch diff --git a/utils/owfs/patches/001-compile-fix.patch b/utils/owfs/patches/001-compile-fix.patch new file mode 100644 index 000..45d1d4a --- /dev/null +++ b/utils/owfs/patches/001-compile-fix.patch @@ -0,0 +1,11 @@ +--- a/module/owlib/src/include/compat_netdb.h.orig a/module/owlib/src/include/compat_netdb.h +@@ -66,7 +66,7 @@ + #ifdef __USE_MISC + /* This is necessary to make this include file properly replace the +Sun version. */ +-# include rpc/netdb.h ++//# include rpc/netdb.h + #endif + + #ifdef HAVE_BITS_NETDB_H ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] [packages] owfs: Fix compilation on uClibc.
It's running also with eglibc. I have just built and ran it on iconnect (kirkwood) with eglibc 2.12. Wojtek - Original Message - I haven't tested it but it should work. I might give it a try with eglibc. Wojtek - Original Message - Wouldn't this patch also be applied if you're compiling with glibc or eglibc? On 6/22/11 3:38 AM, Wojciech Dubowik wrote: By default RPC is disabled in uClibc. Removing rpc/netdb.h doesn't seem to have any impact on configured owfs applications. Fixes #9426 Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- utils/owfs/patches/001-compile-fix.patch | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 utils/owfs/patches/001-compile-fix.patch diff --git a/utils/owfs/patches/001-compile-fix.patch b/utils/owfs/patches/001-compile-fix.patch new file mode 100644 index 000..45d1d4a --- /dev/null +++ b/utils/owfs/patches/001-compile-fix.patch @@ -0,0 +1,11 @@ +--- a/module/owlib/src/include/compat_netdb.h.orig a/module/owlib/src/include/compat_netdb.h +@@ -66,7 +66,7 @@ + #ifdef __USE_MISC + /* This is necessary to make this include file properly replace the +Sun version. */ +-# include rpc/netdb.h ++//# include rpc/netdb.h + #endif + + #ifdef HAVE_BITS_NETDB_H ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] collectd: Fix onewire module compilation.
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- utils/collectd/Makefile |2 +- utils/collectd/patches/400-fix-onewire.patch | 11 +++ 2 files changed, 12 insertions(+), 1 deletions(-) create mode 100644 utils/collectd/patches/400-fix-onewire.patch diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index e7502c9..32b0738 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -282,7 +282,7 @@ $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-n $(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,)) $(eval $(call BuildPlugin,nut,UPS monitoring input,nut,@BROKEN)) $(eval $(call BuildPlugin,olsrd,OLSRd status input,olsrd,)) -$(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi @BROKEN)) +$(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi)) $(eval $(call BuildPlugin,openvpn,OpenVPN traffic/compression input,openvpn,)) $(eval $(call BuildPlugin,ping,ping status input,ping,+PACKAGE_collectd-mod-ping:liboping)) $(eval $(call BuildPlugin,postgresql,PostgreSQL status input,postgresql,+PACKAGE_collectd-mod-postgresql:libpq)) diff --git a/utils/collectd/patches/400-fix-onewire.patch b/utils/collectd/patches/400-fix-onewire.patch new file mode 100644 index 000..1096e1f --- /dev/null +++ b/utils/collectd/patches/400-fix-onewire.patch @@ -0,0 +1,11 @@ +--- a/configure.in b/configure.in +@@ -2493,7 +2493,7 @@ + if test x$withval != xno test x$withval != xyes + then + with_libowcapi_cppflags=-I$withval/include +- with_libowcapi_libs=-L$withval/lib -lowcapi ++ with_libowcapi_libs=-L$withval/lib -lusb -low -lowcapi + with_libowcapi=yes + else + with_libowcapi=$withval -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [kernel] Support for DS2482 1-Wire I2C bus master.
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- package/kernel/modules/w1.mk | 17 + 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk index c4ab616..c2bdd70 100644 --- a/package/kernel/modules/w1.mk +++ b/package/kernel/modules/w1.mk @@ -48,6 +48,23 @@ endef $(eval $(call KernelPackage,w1-master-gpio)) +define KernelPackage/w1-master-ds2482 + TITLE:=DS2482 1-wire i2c bus master driver + KCONFIG:=CONFIG_W1_MASTER_DS2482 + FILES:=$(W1_MASTERS_DIR)/ds2482.ko + AUTOLOAD:=$(call AutoLoad,60,ds2482) + $(call AddDepends/w1,+kmod-i2c-core) +endef + +define KernelPackage/w1-master-ds2482/description + Kernel module for the DS2482 i2c 1-wire bus master driver + NOTE: Init with: echo ds2482 0x18 /sys/bus/i2c/devices/i2c-0/new_device + or use owfs +endef + +$(eval $(call KernelPackage,w1-master-ds2482)) + + define KernelPackage/w1-master-ds2490 TITLE:=DS2490 1-wire usb bus master driver DEPENDS:=@USB_SUPPORT +kmod-usb-core -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] owfs: Fix compilation on uClibc.
By default RPC is disabled in uClibc. Removing rpc/netdb.h doesn't seem to have any impact on configured owfs applications. Fixes #9426 Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- utils/owfs/patches/001-compile-fix.patch | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 utils/owfs/patches/001-compile-fix.patch diff --git a/utils/owfs/patches/001-compile-fix.patch b/utils/owfs/patches/001-compile-fix.patch new file mode 100644 index 000..45d1d4a --- /dev/null +++ b/utils/owfs/patches/001-compile-fix.patch @@ -0,0 +1,11 @@ +--- a/module/owlib/src/include/compat_netdb.h.orig a/module/owlib/src/include/compat_netdb.h +@@ -66,7 +66,7 @@ + #ifdef __USE_MISC + /* This is necessary to make this include file properly replace the +Sun version. */ +-# include rpc/netdb.h ++//# include rpc/netdb.h + #endif + + #ifdef HAVE_BITS_NETDB_H -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] collectd: Support DS18B20 instead of 18S20.
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- .../patches/401-onewire-ds18b20-support.patch | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 utils/collectd/patches/401-onewire-ds18b20-support.patch diff --git a/utils/collectd/patches/401-onewire-ds18b20-support.patch b/utils/collectd/patches/401-onewire-ds18b20-support.patch new file mode 100644 index 000..ab9e8a4 --- /dev/null +++ b/utils/collectd/patches/401-onewire-ds18b20-support.patch @@ -0,0 +1,11 @@ +--- a/src/onewire.c b/src/onewire.c +@@ -45,7 +45,7 @@ + static ow_family_features_t ow_family_features[] = + { + { +-/* family = */ 10., ++/* family = */ 28., + { + { + /* filename = */ temperature, -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [kernel] Support for DS2482 1-Wire I2C bus master.
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- package/kernel/modules/w1.mk | 17 + 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk index c4ab616..c2bdd70 100644 --- a/package/kernel/modules/w1.mk +++ b/package/kernel/modules/w1.mk @@ -48,6 +48,23 @@ endef $(eval $(call KernelPackage,w1-master-gpio)) +define KernelPackage/w1-master-ds2482 + TITLE:=DS2482 1-wire i2c bus master driver + KCONFIG:=CONFIG_W1_MASTER_DS2482 + FILES:=$(W1_MASTERS_DIR)/ds2482.ko + AUTOLOAD:=$(call AutoLoad,60,ds2482) + $(call AddDepends/w1,+kmod-i2c-core) +endef + +define KernelPackage/w1-master-ds2482/description + Kernel module for the DS2482 i2c 1-wire bus master driver + NOTE: Init with: echo ds2482 0x18 /sys/bus/i2c/devices/i2c-0/new_device + or use owfs +endef + +$(eval $(call KernelPackage,w1-master-ds2482)) + + define KernelPackage/w1-master-ds2490 TITLE:=DS2490 1-wire usb bus master driver DEPENDS:=@USB_SUPPORT +kmod-usb-core -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] collectd: Support DS18B20 instead of 18S20.
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- .../patches/401-onewire-ds18b20-support.patch | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 utils/collectd/patches/401-onewire-ds18b20-support.patch diff --git a/utils/collectd/patches/401-onewire-ds18b20-support.patch b/utils/collectd/patches/401-onewire-ds18b20-support.patch new file mode 100644 index 000..ab9e8a4 --- /dev/null +++ b/utils/collectd/patches/401-onewire-ds18b20-support.patch @@ -0,0 +1,11 @@ +--- a/src/onewire.c b/src/onewire.c +@@ -45,7 +45,7 @@ + static ow_family_features_t ow_family_features[] = + { + { +-/* family = */ 10., ++/* family = */ 28., + { + { + /* filename = */ temperature, -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] owfs: Fix compilation on uClibc.
By default RPC is disabled in uClibc. Removing rpc/netdb.h doesn't seem to have any impact on configured owfs applications. Fixes #9426 Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- utils/owfs/patches/001-compile-fix.patch | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 utils/owfs/patches/001-compile-fix.patch diff --git a/utils/owfs/patches/001-compile-fix.patch b/utils/owfs/patches/001-compile-fix.patch new file mode 100644 index 000..45d1d4a --- /dev/null +++ b/utils/owfs/patches/001-compile-fix.patch @@ -0,0 +1,11 @@ +--- a/module/owlib/src/include/compat_netdb.h.orig a/module/owlib/src/include/compat_netdb.h +@@ -66,7 +66,7 @@ + #ifdef __USE_MISC + /* This is necessary to make this include file properly replace the +Sun version. */ +-# include rpc/netdb.h ++//# include rpc/netdb.h + #endif + + #ifdef HAVE_BITS_NETDB_H -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] collectd: Fix onewire module compilation.
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- utils/collectd/Makefile |2 +- utils/collectd/patches/400-fix-onewire.patch | 11 +++ 2 files changed, 12 insertions(+), 1 deletions(-) create mode 100644 utils/collectd/patches/400-fix-onewire.patch diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index e7502c9..32b0738 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -282,7 +282,7 @@ $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-n $(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,)) $(eval $(call BuildPlugin,nut,UPS monitoring input,nut,@BROKEN)) $(eval $(call BuildPlugin,olsrd,OLSRd status input,olsrd,)) -$(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi @BROKEN)) +$(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi)) $(eval $(call BuildPlugin,openvpn,OpenVPN traffic/compression input,openvpn,)) $(eval $(call BuildPlugin,ping,ping status input,ping,+PACKAGE_collectd-mod-ping:liboping)) $(eval $(call BuildPlugin,postgresql,PostgreSQL status input,postgresql,+PACKAGE_collectd-mod-postgresql:libpq)) diff --git a/utils/collectd/patches/400-fix-onewire.patch b/utils/collectd/patches/400-fix-onewire.patch new file mode 100644 index 000..1096e1f --- /dev/null +++ b/utils/collectd/patches/400-fix-onewire.patch @@ -0,0 +1,11 @@ +--- a/configure.in b/configure.in +@@ -2493,7 +2493,7 @@ + if test x$withval != xno test x$withval != xyes + then + with_libowcapi_cppflags=-I$withval/include +- with_libowcapi_libs=-L$withval/lib -lowcapi ++ with_libowcapi_libs=-L$withval/lib -lusb -low -lowcapi + with_libowcapi=yes + else + with_libowcapi=$withval -- 1.7.4.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 0/2] [atheros] Fix dma mapping and register addresses for ahb bus
This set of patches allows to use ath5k driver in ahb mode on AR231x platforms. Note: Kernel 2.6.37 and up is not yet supported. Wojciech Dubowik (2): [atheros] Use physical addresses definition for AR2315 the same way as AR5312. Fixes ioremap problem for wmac devices. [atheros] Fix dma mapping for AHB bus. .../250-fix-dma-mapping-for-ahb-bus.patch | 37 ++ .../251-ar2315_use_physical_addresses.patch| 72 .../250-fix-dma-mapping-for-ahb-bus.patch | 31 + .../251-ar2315_use_physical_addresses.patch| 72 .../250-fix-dma-mapping-for-ahb-bus.patch | 31 + .../251-ar2315_use_physical_addresses.patch| 72 .../250-fix-dma-mapping-for-ahb-bus.patch | 31 + .../251-ar2315_use_physical_addresses.patch| 72 .../251-ar2315_use_physical_addresses.patch| 72 9 files changed, 490 insertions(+), 0 deletions(-) create mode 100644 target/linux/atheros/patches-2.6.32/250-fix-dma-mapping-for-ahb-bus.patch create mode 100644 target/linux/atheros/patches-2.6.32/251-ar2315_use_physical_addresses.patch create mode 100644 target/linux/atheros/patches-2.6.34/250-fix-dma-mapping-for-ahb-bus.patch create mode 100644 target/linux/atheros/patches-2.6.34/251-ar2315_use_physical_addresses.patch create mode 100644 target/linux/atheros/patches-2.6.35/250-fix-dma-mapping-for-ahb-bus.patch create mode 100644 target/linux/atheros/patches-2.6.35/251-ar2315_use_physical_addresses.patch create mode 100644 target/linux/atheros/patches-2.6.36/250-fix-dma-mapping-for-ahb-bus.patch create mode 100644 target/linux/atheros/patches-2.6.36/251-ar2315_use_physical_addresses.patch create mode 100644 target/linux/atheros/patches-2.6.37/251-ar2315_use_physical_addresses.patch ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 1/2] [atheros] Use physical addresses definition for AR2315 the same way as AR5312. Fixes ioremap problem for wmac devices.
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- .../251-ar2315_use_physical_addresses.patch| 72 .../251-ar2315_use_physical_addresses.patch| 72 .../251-ar2315_use_physical_addresses.patch| 72 .../251-ar2315_use_physical_addresses.patch| 72 .../251-ar2315_use_physical_addresses.patch| 72 5 files changed, 360 insertions(+), 0 deletions(-) create mode 100644 target/linux/atheros/patches-2.6.32/251-ar2315_use_physical_addresses.patch create mode 100644 target/linux/atheros/patches-2.6.34/251-ar2315_use_physical_addresses.patch create mode 100644 target/linux/atheros/patches-2.6.35/251-ar2315_use_physical_addresses.patch create mode 100644 target/linux/atheros/patches-2.6.36/251-ar2315_use_physical_addresses.patch create mode 100644 target/linux/atheros/patches-2.6.37/251-ar2315_use_physical_addresses.patch diff --git a/target/linux/atheros/patches-2.6.32/251-ar2315_use_physical_addresses.patch b/target/linux/atheros/patches-2.6.32/251-ar2315_use_physical_addresses.patch new file mode 100644 index 000..a32cfc1 --- /dev/null +++ b/target/linux/atheros/patches-2.6.32/251-ar2315_use_physical_addresses.patch @@ -0,0 +1,72 @@ +--- a/arch/mips/ar231x/ar2315.c b/arch/mips/ar231x/ar2315.c +@@ -367,7 +367,7 @@ + .reset_base = AR2315_RESET, + .reset_mac = AR2315_RESET_ENET0, + .reset_phy = AR2315_RESET_EPHY0, +- .phy_base = AR2315_ENET0, ++ .phy_base = KSEG1ADDR(AR2315_ENET0), + .config = ar231x_board, + }; + +@@ -405,13 +405,13 @@ + static inline u32 + spiflash_read_reg(int reg) + { +- return ar231x_read_reg(KSEG1ADDR(AR2315_SPI) + reg); ++ return ar231x_read_reg(AR2315_SPI + reg); + } + + static inline void + spiflash_write_reg(int reg, u32 data) + { +- ar231x_write_reg(KSEG1ADDR(AR2315_SPI) + reg, data); ++ ar231x_write_reg(AR2315_SPI + reg, data); + } + + static u32 +@@ -540,7 +540,7 @@ + ar2315_init_gpio(); + platform_device_register(ar2315_wdt); + platform_device_register(ar2315_spiflash); +- ar231x_add_ethernet(0, AR2315_ENET0, AR2315_IRQ_ENET0_INTRS, ++ ar231x_add_ethernet(0, KSEG1ADDR(AR2315_ENET0), AR2315_IRQ_ENET0_INTRS, + ar2315_eth_data); + ar231x_add_wmac(0, AR2315_WLAN0, AR2315_IRQ_WLAN0_INTRS); + +--- a/arch/mips/ar231x/pci.c b/arch/mips/ar231x/pci.c +@@ -176,7 +176,7 @@ + if (ar231x_devtype != DEV_TYPE_AR2315) + return -ENODEV; + +- configspace = (unsigned long) ioremap_nocache(0x8000, 1*1024*1024); /* Remap PCI config space */ ++ configspace = (unsigned long) ioremap_nocache(AR2315_PCIEXT, 1*1024*1024); /* Remap PCI config space */ + ar231x_pci_controller.io_map_base = + (unsigned long) ioremap_nocache(AR531X_MEM_BASE + AR531X_MEM_SIZE, AR531X_IO_SIZE); + set_io_port_base(ar231x_pci_controller.io_map_base); /* PCI I/O space */ +--- a/arch/mips/include/asm/mach-ar231x/ar2315_regs.h b/arch/mips/include/asm/mach-ar231x/ar2315_regs.h +@@ -27,14 +27,14 @@ + * Address map + */ + #define AR2315_SPI_READ 0x0800 /* SPI FLASH */ +-#define AR2315_WLAN00xB000 /* Wireless MMR */ +-#define AR2315_PCI 0xB010 /* PCI MMR */ +-#define AR2315_SDRAMCTL 0xB030 /* SDRAM MMR */ +-#define AR2315_LOCAL0xB040 /* LOCAL BUS MMR */ +-#define AR2315_ENET00xB050 /* ETHERNET MMR */ +-#define AR2315_DSLBASE 0xB100 /* RESET CONTROL MMR */ +-#define AR2315_UART00xB113 /* UART MMR */ +-#define AR2315_SPI 0xB130 /* SPI FLASH MMR */ ++#define AR2315_WLAN00x1000 /* Wireless MMR */ ++#define AR2315_PCI 0x1010 /* PCI MMR */ ++#define AR2315_SDRAMCTL 0x1030 /* SDRAM MMR */ ++#define AR2315_LOCAL0x1040 /* LOCAL BUS MMR */ ++#define AR2315_ENET00x1050 /* ETHERNET MMR */ ++#define AR2315_DSLBASE 0x1100 /* RESET CONTROL MMR */ ++#define AR2315_UART00x1113 /* UART MMR */ ++#define AR2315_SPI 0x1130 /* SPI FLASH MMR */ + #define AR2315_PCIEXT 0x8000 /* pci external */ + + /* diff --git a/target/linux/atheros/patches-2.6.34/251-ar2315_use_physical_addresses.patch b/target/linux/atheros/patches-2.6.34/251-ar2315_use_physical_addresses.patch new file mode 100644 index 000..a32cfc1 --- /dev/null +++ b/target/linux/atheros/patches-2.6.34/251-ar2315_use_physical_addresses.patch @@ -0,0 +1,72 @@ +--- a/arch/mips/ar231x/ar2315.c b/arch/mips/ar231x/ar2315.c +@@ -367,7 +367,7 @@ + .reset_base = AR2315_RESET, + .reset_mac = AR2315_RESET_ENET0, + .reset_phy = AR2315_RESET_EPHY0, +- .phy_base
[OpenWrt-Devel] [PATCH] mac80211: For ath5k AHB take mac adress from board config.
mac80211: For ath5k AHB take mac addresses from board configuration and not from calibration data. Otherwise each radio instance will have same MAC. Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- .../451-add-platform-eeprom-support-to-ath5k.patch | 181 +++- 1 files changed, 136 insertions(+), 45 deletions(-) diff --git a/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch b/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch index ff96b78..c016920 100644 --- a/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch +++ b/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch @@ -1,51 +1,16 @@ a/drivers/net/wireless/ath/ath5k/eeprom.c -+++ b/drivers/net/wireless/ath/ath5k/eeprom.c -@@ -22,6 +22,8 @@ - \*/ - - #include linux/slab.h -+#include linux/ath5k_platform.h -+#include linux/pci.h - - #include ath5k.h - #include reg.h -@@ -1726,7 +1728,7 @@ ath5k_eeprom_read_spur_chans(struct ath5 - } - - /* -- * Read the MAC address from eeprom -+ * Read the MAC address from eeprom or platform_data +Index: compat-wireless-2010-12-16/drivers/net/wireless/ath/ath5k/pci.c +=== +--- compat-wireless-2010-12-16.orig/drivers/net/wireless/ath/ath5k/pci.c 2010-12-17 22:22:02.0 +0100 compat-wireless-2010-12-16/drivers/net/wireless/ath/ath5k/pci.c 2011-01-06 12:52:58.934762991 +0100 +@@ -15,6 +15,7 @@ */ - int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac) - { -@@ -1734,6 +1736,16 @@ int ath5k_eeprom_read_mac(struct ath5k_h - u32 total, offset; - u16 data; - int octet, ret; -+ struct ath5k_platform_data *pdata = NULL; -+ -+ if (ah-ah_sc-pdev) -+ pdata = ah-ah_sc-pdev-dev.platform_data; -+ -+ if (pdata pdata-macaddr) -+ { -+ memcpy(mac, pdata-macaddr, ETH_ALEN); -+ return 0; -+ } - ret = ath5k_hw_nvram_read(ah, 0x20, data); - if (ret) a/drivers/net/wireless/ath/ath5k/pci.c -+++ b/drivers/net/wireless/ath/ath5k/pci.c -@@ -17,6 +17,7 @@ #include linux/nl80211.h ++#include linux/ath5k_platform.h #include linux/pci.h #include linux/pci-aspm.h -+#include linux/ath5k_platform.h #include ../ath.h - #include ath5k.h - #include debug.h -@@ -73,6 +74,19 @@ bool ath5k_pci_eeprom_read(struct ath_co +@@ -73,6 +74,18 @@ { struct ath5k_hw *ah = (struct ath5k_hw *) common-ah; u32 status, timeout; @@ -56,12 +21,138 @@ + + if (pdata pdata-eeprom_data pdata-eeprom_data[0] == AR5K_EEPROM_MAGIC_VALUE) + { -+ if (offset = ATH5K_PLAT_EEP_MAX_WORDS) -+ return -EIO; -+ ++ ATH5K_INFO(ah-ah_sc, using eeprom-content from platform_data\n); ++ if (offset = ATH5K_PLAT_EEP_MAX_WORDS) return -EIO; + *data = pdata-eeprom_data[offset]; + return 0; + } /* * Initialize EEPROM access +@@ -107,6 +120,49 @@ + return 0; + } + ++/* ++ * Read the MAC address from eeprom or platform_data ++ */ ++int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac) ++{ ++ u8 mac_d[ETH_ALEN] = {}; ++ u32 total, offset; ++ u16 data; ++ int octet, ret; ++ struct ath5k_platform_data *pdata = NULL; ++ ++ if (ah-ah_sc-pdev) ++ pdata = ah-ah_sc-pdev-dev.platform_data; ++ ++ if (pdata pdata-macaddr) ++ { ++ memcpy(mac, pdata-macaddr, ETH_ALEN); ++ return 0; ++ } ++ ++ ret = ath5k_hw_nvram_read(ah, 0x20, data); ++ if (ret) ++ return ret; ++ ++ for (offset = 0x1f, octet = 0, total = 0; offset = 0x1d; offset--) { ++ ret = ath5k_hw_nvram_read(ah, offset, data); ++ if (ret) ++ return ret; ++ ++ total += data; ++ mac_d[octet + 1] = data 0xff; ++ mac_d[octet] = data 8; ++ octet += 2; ++ } ++ ++ if (!total || total == 3 * 0x) ++ return -EINVAL; ++ ++ memcpy(mac, mac_d, ETH_ALEN); ++ ++ return 0; ++} ++ + /* Common ath_bus_opts structure */ + static const struct ath_bus_ops ath_pci_bus_ops = { + .ath_bus_type = ATH_PCI, +Index: compat-wireless-2010-12-16/drivers/net/wireless/ath/ath5k/eeprom.c +=== +--- compat-wireless-2010-12-16.orig/drivers/net/wireless/ath/ath5k/eeprom.c 2010-12-17 22:22:01.0 +0100 compat-wireless-2010-12-16/drivers/net/wireless/ath/ath5k/eeprom.c 2011-01-06 12:55:48.004762993 +0100 +@@ -1725,40 +1725,6 @@ + return ret; + } + +-/* +- * Read the MAC address from eeprom +- */ +-int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac) +-{ +- u8 mac_d[ETH_ALEN] = {}; +- u32 total, offset; +- u16 data; +- int octet
Re: [OpenWrt-Devel] [PATCH] ath5k: Enable AHB support
Hello Felix, I have already started working in latest wireless-testing for these changes. I just would like to hear some comments before posting. Getting it in would make sense because some files are split and merging is atm manual work. Br, Wojtek - Original Message - From: Felix Fietkau n...@openwrt.org To: OpenWrt Development List openwrt-devel@lists.openwrt.org Cc: Wojciech Dubowik dubo...@neratec.com Sent: Dienstag, 9. November 2010 19:21:16 Subject: Re: [OpenWrt-Devel] [PATCH] ath5k: Enable AHB support On 2010-11-09 7:12 PM, Wojciech Dubowik wrote: Hello, Following the message http://www.mail-archive.com/ath5k-de...@lists.ath5k.org/msg04085.html I have decided to try to enable ahb support for ath5k. I have based my work on Felix Fetikau's patches (see message thread for original sources). I had to copy and paste some code from ath9k to enable late cache size initialization using ath_bus_opts. The code is not really clean and not ready for linux-wireless. Anyway it's just matter of some additional work and testing. I have tested only access point with open authentication and wpa2 on AR5414 for pci functionality and on AR5312 for AHB bus. I will test it soon on AR2313 as soon as I get serial console cable assembled. I don't have all the possible chip revisions so I don't know how they will behave after these changes. Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com Nice work, thanks! I'll take a closer look at it later, I think we should start submitting the clean parts of this patch series to linux-wireless as soon as possible, and then work on cleaning up the rest. - Felix -- Wojciech Dubowik Senior Software Engineer Neratec Solutions AG Rosswiesstr. 29, CH-8608 Bubikon, Switzerland Tel: +41 55 253 2096 (office) Fax: +41 55 253 2070 wojciech.dubo...@neratec.com http://www.neratec.com ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [kirkwood] Leds and gpio keys support for Iomega iConnect
Adds leds and gpio keys support for Iomega iConnect. Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- Index: target/linux/kirkwood/patches/200-iconnect.patch === --- target/linux/kirkwood/patches/200-iconnect.patch(revision 23320) +++ target/linux/kirkwood/patches/200-iconnect.patch(working copy) @@ -23,9 +23,19 @@ endmenu endif +--- a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h +@@ -103,6 +103,7 @@ + #define MPP11_SATA0_ACTn MPP( 11, 0x5, 0, 1, 0, 1, 1, 1) + + #define MPP12_GPO MPP( 12, 0x0, 0, 1, 1, 1, 1, 1) ++#define MPP12_GPIOMPP( 12, 0x0, 1, 1, 1, 1, 1, 1) + #define MPP12_SD_CLK MPP( 12, 0x1, 0, 1, 1, 1, 1, 1) + + #define MPP13_GPIOMPP( 13, 0x0, 1, 1, 1, 1, 1, 1) --- /dev/null +++ b/arch/arm/mach-kirkwood/iconnect-setup.c -@@ -0,0 +1,95 @@ +@@ -1,0 +1,190 @@ +/* + * arch/arm/mach-kirkwood/iconnect-setup.c + * @@ -43,6 +53,10 @@ +#include linux/mtd/partitions.h +#include linux/mv643xx_eth.h +#include linux/ethtool.h ++#include linux/gpio.h ++#include linux/gpio_keys.h ++#include linux/input.h ++#include linux/leds.h +#include asm/mach-types.h +#include asm/mach/arch.h +#include mach/kirkwood.h @@ -73,12 +87,100 @@ + .phy_addr = MV643XX_ETH_PHY_ADDR(11), +}; + ++static struct gpio_led iconnect_led_pins[] = { ++ { ++ .name = iconnect:blue:power, ++ .default_trigger= default-on, ++ .gpio = 42, ++ }, ++ { ++ .name = iconnect:red:power, ++ .gpio = 43, ++ }, ++ { ++ .name = iconnect:blue:usb1, ++ .gpio = 44, ++ }, ++ { ++ .name = iconnect:blue:usb2, ++ .gpio = 45, ++ }, ++ { ++ .name = iconnect:blue:usb3, ++ .gpio = 46, ++ }, ++ { ++ .name = iconnect:blue:usb4, ++ .gpio = 47, ++ }, ++ { ++ .name = iconnect:blue:otb, ++ .gpio = 48, ++ }, ++}; ++ ++static struct gpio_led_platform_data iconnect_led_data = { ++ .leds = iconnect_led_pins, ++ .num_leds = ARRAY_SIZE(iconnect_led_pins), ++}; ++ ++static struct platform_device iconnect_leds = { ++ .name = leds-gpio, ++ .id = -1, ++ .dev= { ++ .platform_data = iconnect_led_data, ++ } ++}; ++ ++#define ICONNECT_GPIO_KEY_RESET 12 ++#define ICONNECT_GPIO_KEY_OTB 35 ++ ++#define ICONNECT_SW_RESET 0x00 ++#define ICONNECT_SW_OTB 0x01 ++ ++static struct gpio_keys_button iconnect_buttons[] = { ++ { ++ .type = EV_SW, ++ .code = ICONNECT_SW_RESET, ++ .gpio = ICONNECT_GPIO_KEY_RESET, ++ .desc = Reset Button, ++ .active_low = 1, ++ .debounce_interval = 100, ++ }, ++ { ++ .type = EV_SW, ++ .code = ICONNECT_SW_OTB, ++ .gpio = ICONNECT_GPIO_KEY_OTB, ++ .desc = OTB Button, ++ .active_low = 1, ++ .debounce_interval = 100, ++ }, ++}; ++ ++static struct gpio_keys_platform_data iconnect_button_data = { ++ .buttons= iconnect_buttons, ++ .nbuttons = ARRAY_SIZE(iconnect_buttons), ++}; ++ ++static struct platform_device iconnect_button_device = { ++ .name = gpio-keys, ++ .id = -1, ++ .num_resources = 0, ++ .dev= { ++ .platform_data = iconnect_button_data, ++ }, ++}; ++ +static unsigned int iconnect_mpp_config[] __initdata = { -+ MPP8_TW_SDA, -+ MPP9_TW_SCK, -+ MPP10_UART0_TXD, -+ MPP11_UART0_RXD, -+ MPP28_GPIO, ++ MPP12_GPIO, /*Input for reset button*/ ++ MPP35_GPIO, /*Input for OTB button*/ ++ MPP42_GPIO, ++ MPP43_GPIO, ++ MPP44_GPIO, ++ MPP45_GPIO, ++ MPP46_GPIO, ++ MPP47_GPIO, ++ MPP48_GPIO, + 0 +}; + @@ -100,6 +202,9 @@ + + kirkwood_uart0_init(); + kirkwood_i2c_init(); ++ ++ platform_device_register(iconnect_leds); ++ platform_device_register(iconnect_button_device); +} + +static int __init iconnect_pci_init(void) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo
[OpenWrt-Devel] [PATCH] [uboot-kirkwood] Fixed support for Iomega iConnect board.
* Added configuration file. * Set blue power led during bootup * enabled pci express Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- Index: package/uboot-kirkwood/files/include/configs/iconnect.h === --- package/uboot-kirkwood/files/include/configs/iconnect.h (revision 0) +++ package/uboot-kirkwood/files/include/configs/iconnect.h (revision 0) @@ -0,0 +1,217 @@ +/* + * (C) Copyright 2009 + * Marvell Semiconductor www.marvell.com + * Written-by: Prafulla Wadaskar prafu...@marvell.com + * + * See file CREDITS for list of people who contributed to this + * project. + * + * 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 Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef _CONFIG_ICONNECT_H +#define _CONFIG_ICONNECT_H + +/* + * Version number information + */ +#define CONFIG_IDENT_STRING\nIomega iConnect Wireless + + +//#define DEBUG + + +/* + * High Level Configuration Options (easy to change) + */ +#define CONFIG_MARVELL 1 +#define CONFIG_ARM926EJS 1 /* Basic Architecture */ +#define CONFIG_FEROCEON_88FR1311 /* CPU Core subversion */ +#define CONFIG_KIRKWOOD1 /* SOC Family Name */ +#define CONFIG_KW88F6281 1 /* SOC Name */ +#define CONFIG_MACH_ICONNECT /* Machine type */ + +#define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */ +#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */ +#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */ +#define CONFIG_KIRKWOOD_PCIE_INIT /*enable pci express on iconnect board*/ + +/* + * CLKs configurations + */ +#define CONFIG_SYS_HZ 1000 + +/* + * NS16550 Configuration + */ +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE(-4) +#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK +#define CONFIG_SYS_NS16550_COM1KW_UART0_BASE + +/* + * Serial Port configuration + * The following definitions let you select what serial you want to use + * for your console driver. + */ + +#define CONFIG_CONS_INDEX 1 /*Console on UART0 */ +#define CONFIG_BAUDRATE115200 +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ + 115200,230400, 460800, 921600 } +/* auto boot */ +#define CONFIG_BOOTDELAY 3 /* default enable autoboot */ + +/* + * For booting Linux, the board info and command line data + * have to be in the first 8 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_INITRD_TAG 1 /* enable INITRD tag */ +#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */ + +#defineCONFIG_SYS_PROMPT Marvell /* Command Prompt */ +#defineCONFIG_SYS_CBSIZE 1024/* Console I/O Buff Size */ +#defineCONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ + +sizeof(CONFIG_SYS_PROMPT) + 16)/* Print Buff */ + +/* + * Commands configuration + */ +#define CONFIG_SYS_NO_FLASH/* Declare no flash (NOR/SPI) */ +#include config_cmd_default.h +#define CONFIG_CMD_AUTOSCRIPT +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_ENV +#define CONFIG_CMD_MII +#define CONFIG_CMD_NAND +#define CONFIG_CMD_PING +#define CONFIG_CMD_USB + +/* + * NAND configuration + */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_KIRKWOOD +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define NAND_MAX_CHIPS 1 +#define CONFIG_SYS_NAND_BASE 0xD800 /* KW_DEFADR_NANDF */ +#define NAND_ALLOW_ERASE_ALL 1 +#endif + +/* + * Environment variables configurations + */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_ENV_IS_IN_NAND 1 +#define CONFIG_ENV_SECT_SIZE 0x2 /* 128K */ +#else +#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ +#endif +/* + * max 4k env size is enough, but in case of nand + * it has to be rounded to sector size + */ +#define CONFIG_ENV_SIZE0x2 /* 128k */ +#define CONFIG_ENV_ADDR0xc
[OpenWrt-Devel] [PATCH] [kirkwood][orion] I2C module support
This patch adds support for configuring kirkwood/orion i2c module. Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- Index: package/kernel/modules/i2c.mk === --- package/kernel/modules/i2c.mk (revision 23166) +++ package/kernel/modules/i2c.mk (working copy) @@ -167,3 +167,19 @@ endef $(eval $(call KernelPackage,i2c-ibm-iic)) + +I2C_MV64XXX_MODULES:=\ + CONFIG_I2C_MV64XXX:drivers/i2c/busses/i2c-mv64xxx + +define KernelPackage/i2c-mv64xxx + $(call i2c_defaults,$(I2C_MV64XXX_MODULES),59) + TITLE:=Orion Platform I2C interface support + DEPENDS:=...@target_kirkwood||TARGET_orion +kmod-i2c-core +endef + +define KernelPackage/i2c-mv64xxx/description + Kernel module for I2C interface on the Kirkwood and Orion + family processors. +endef + +$(eval $(call KernelPackage,i2c-mv64xxx)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [u-boot] [kirkwood] uboot-kirkwood support for iomega iconnect wireless
Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- Index: package/uboot-kirkwood/files/include/configs/iconnect.h === --- package/uboot-kirkwood/files/include/configs/iconnect.h (revision 0) +++ package/uboot-kirkwood/files/include/configs/iconnect.h (revision 0) @@ -0,0 +1,216 @@ +/* + * (C) Copyright 2009 + * Marvell Semiconductor www.marvell.com + * Written-by: Prafulla Wadaskar prafu...@marvell.com + * + * See file CREDITS for list of people who contributed to this + * project. + * + * 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 Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef _CONFIG_ICONNECT_H +#define _CONFIG_ICONNECT_H + +/* + * Version number information + */ +#define CONFIG_IDENT_STRING\nIomega iConnect Wireless + + +//#define DEBUG + + +/* + * High Level Configuration Options (easy to change) + */ +#define CONFIG_MARVELL 1 +#define CONFIG_ARM926EJS 1 /* Basic Architecture */ +#define CONFIG_FEROCEON_88FR1311 /* CPU Core subversion */ +#define CONFIG_KIRKWOOD1 /* SOC Family Name */ +#define CONFIG_KW88F6281 1 /* SOC Name */ +#define CONFIG_MACH_ICONNECT /* Machine type */ + +#define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */ +#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */ +#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */ + +/* + * CLKs configurations + */ +#define CONFIG_SYS_HZ 1000 + +/* + * NS16550 Configuration + */ +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE(-4) +#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK +#define CONFIG_SYS_NS16550_COM1KW_UART0_BASE + +/* + * Serial Port configuration + * The following definitions let you select what serial you want to use + * for your console driver. + */ + +#define CONFIG_CONS_INDEX 1 /*Console on UART0 */ +#define CONFIG_BAUDRATE115200 +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ + 115200,230400, 460800, 921600 } +/* auto boot */ +#define CONFIG_BOOTDELAY 3 /* default enable autoboot */ + +/* + * For booting Linux, the board info and command line data + * have to be in the first 8 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_INITRD_TAG 1 /* enable INITRD tag */ +#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */ + +#defineCONFIG_SYS_PROMPT Marvell /* Command Prompt */ +#defineCONFIG_SYS_CBSIZE 1024/* Console I/O Buff Size */ +#defineCONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ + +sizeof(CONFIG_SYS_PROMPT) + 16)/* Print Buff */ + +/* + * Commands configuration + */ +#define CONFIG_SYS_NO_FLASH/* Declare no flash (NOR/SPI) */ +#include config_cmd_default.h +#define CONFIG_CMD_AUTOSCRIPT +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_ENV +#define CONFIG_CMD_MII +#define CONFIG_CMD_NAND +#define CONFIG_CMD_PING +#define CONFIG_CMD_USB + +/* + * NAND configuration + */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_NAND_KIRKWOOD +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define NAND_MAX_CHIPS 1 +#define CONFIG_SYS_NAND_BASE 0xD800 /* KW_DEFADR_NANDF */ +#define NAND_ALLOW_ERASE_ALL 1 +#endif + +/* + * Environment variables configurations + */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_ENV_IS_IN_NAND 1 +#define CONFIG_ENV_SECT_SIZE 0x2 /* 128K */ +#else +#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ +#endif +/* + * max 4k env size is enough, but in case of nand + * it has to be rounded to sector size + */ +#define CONFIG_ENV_SIZE0x2 /* 128k */ +#define CONFIG_ENV_ADDR0xc /*it's above original iConnect u-boot envirinment 0xa */ +#define CONFIG_ENV_OFFSET 0xc /* env starts here */ + +/* + * Default environment
[OpenWrt-Devel] [PATCH] [kirkwood] Iomega iConnect Wireless platform support
This patch adds support for Iomega iConnect Wireless. Leds and wireless card support are still missing. Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com --- Index: target/linux/kirkwood/profiles/300-Iconnect.mk === --- target/linux/kirkwood/profiles/300-Iconnect.mk (revision 0) +++ target/linux/kirkwood/profiles/300-Iconnect.mk (revision 0) @@ -0,0 +1,17 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Iconnect + NAME:=Iomega iConnect Wireless + PACKAGES:=kmod-i2c-mv64xxx kmod-hwmon-lm63 +endef + +define Profile/Iconnect/Description +Iomega iConnect Wireless +endef + +$(eval $(call Profile,Iconnect)) Index: target/linux/kirkwood/patches/200-iconnect.patch === --- target/linux/kirkwood/patches/200-iconnect.patch(revision 0) +++ target/linux/kirkwood/patches/200-iconnect.patch(revision 0) @@ -0,0 +1,123 @@ +--- a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile +@@ -8,6 +8,7 @@ + obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o + obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o + obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o ++obj-$(CONFIG_MACH_ICONNECT) += iconnect-setup.o + obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o + obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o + obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o +--- a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig +@@ -105,6 +105,12 @@ + Say 'Y' here if you want your kernel to support the + Seagate FreeAgent DockStar. + ++config MACH_ICONNECT ++ bool Iomega iConnect Wireless ++ help ++Say 'Y' here if you want your kernel to support the ++Iomega iConnect Wireless. ++ + endmenu + + endif +--- /dev/null b/arch/arm/mach-kirkwood/iconnect-setup.c +@@ -1,0 +1,95 @@ ++/* ++ * arch/arm/mach-kirkwood/iconnect-setup.c ++ * ++ * Iomega iConnect Wireless ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed as is without any ++ * warranty of any kind, whether express or implied. ++ */ ++ ++#include linux/kernel.h ++#include linux/init.h ++#include linux/platform_device.h ++#include linux/irq.h ++#include linux/mtd/partitions.h ++#include linux/mv643xx_eth.h ++#include linux/ethtool.h ++#include asm/mach-types.h ++#include asm/mach/arch.h ++#include mach/kirkwood.h ++#include common.h ++#include mpp.h ++ ++static struct mtd_partition iconnect_nand_parts[] = { ++ { ++ .name = u-boot, ++ .offset = 0, ++ .size = SZ_1M ++ }, { ++ .name = uImage, ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_1M + SZ_2M ++ }, { ++ .name = rootfs, ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_32M, ++ }, { ++ .name = data, ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = MTDPART_SIZ_FULL ++ }, ++}; ++ ++static struct mv643xx_eth_platform_data iconnect_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(11), ++}; ++ ++static unsigned int iconnect_mpp_config[] __initdata = { ++ MPP8_TW_SDA, ++ MPP9_TW_SCK, ++ MPP10_UART0_TXD, ++ MPP11_UART0_RXD, ++ MPP28_GPIO, ++ 0 ++}; ++ ++static void __init iconnect_init(void) ++{ ++ u32 dev, rev; ++ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ kirkwood_mpp_conf(iconnect_mpp_config); ++ ++ kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25); ++ kirkwood_ehci_init(); ++ ++ kirkwood_ge00_init(iconnect_ge00_data); ++ kirkwood_pcie_id(dev, rev); ++ ++ kirkwood_uart0_init(); ++ kirkwood_i2c_init(); ++} ++ ++static int __init iconnect_pci_init(void) ++{ ++ if (machine_is_iconnect()) ++ kirkwood_pcie_init(); ++ ++ return 0; ++} ++subsys_initcall(iconnect_pci_init); ++ ++ ++MACHINE_START(ICONNECT, Iomega iConnect Wireless) ++ .phys_io= KIRKWOOD_REGS_PHYS_BASE, ++ .io_pg_offst= ((KIRKWOOD_REGS_VIRT_BASE) 18) 0xfffc, ++ .boot_params= 0x0100, ++ .init_machine = iconnect_init, ++ .map_io = kirkwood_map_io, ++ .init_irq = kirkwood_init_irq, ++ .timer = kirkwood_timer, ++MACHINE_END Index: target/linux/kirkwood/config-default === --- target/linux/kirkwood/config-default(revision 23166) +++ target/linux/kirkwood/config-default(working copy) @@ -95,6 +95,7 @@ CONFIG_MACH_DOCKSTAR=y # CONFIG_MACH_ESATA_SHEEVAPLUG
[OpenWrt-Devel] [PATCH] Support for Iomega iConnect Wireless (kirkwood)
This patch adds support for Iomega iConnect Wireless board. It overrides Marvell RD-88F6281 board since they share same mach id. This board has already serial header installed with following pinout: +3.3 || TX || GND || RX I have tested ramdisk image from u-boot with: tftpboot 0x200 openwrt-kirkwood-uImage bootm 0x200 Working: - ethernet - usb TODO: - flashing to NAND (haven't tested it yet) - get crypto driver loaded - add support for on-board LM63 sensor - add support for RT3090 wireless card - eventually get mach id for this board and add separate setup file Signed-off-by: Wojciech Dubowik wojciech.dubo...@neratec.com Index: target/linux/kirkwood/profiles/300-iConnect.mk === --- target/linux/kirkwood/profiles/300-iConnect.mk (revision 0) +++ target/linux/kirkwood/profiles/300-iConnect.mk (revision 0) @@ -0,0 +1,17 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Iconnect + NAME:=Iomega iConnect Wireless + PACKAGES:= +endef + +define Profile/Iconnect/Description +Iomega iConnect Wireless +endef + +$(eval $(call Profile,Iconnect)) Index: target/linux/kirkwood/patches/200-iconnect.patch === --- target/linux/kirkwood/patches/200-iconnect.patch(revision 0) +++ target/linux/kirkwood/patches/200-iconnect.patch(revision 0) @@ -0,0 +1,112 @@ +--- a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig +@@ -105,6 +105,14 @@ + Say 'Y' here if you want your kernel to support the + Seagate FreeAgent DockStar. + ++config MACH_ICONNECT ++ bool Iomega iConnect Wireless ++ depends on MACH_RD88F6281 ++ help ++Say 'Y' here if you want your kernel to support the ++Iomega iConnect Wireless. Overrides Marvell RD-88F6281 ++Reference Board. ++ + endmenu + + endif +--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c +@@ -24,6 +24,31 @@ + #include common.h + #include mpp.h + ++#ifdef CONFIG_MACH_ICONNECT ++static struct mtd_partition rd88f6281_nand_parts[] = { ++ { ++ .name = u-boot, ++ .offset = 0, ++ .size = SZ_1M ++ }, { ++ .name = uImage, ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_1M + SZ_2M ++ }, { ++ .name = rootfs, ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_32M, ++ }, { ++ .name = data, ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = MTDPART_SIZ_FULL ++ }, ++}; ++ ++static struct mv643xx_eth_platform_data rd88f6281_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(11), ++}; ++#else + static struct mtd_partition rd88f6281_nand_parts[] = { + { + .name = u-boot, +@@ -41,9 +66,7 @@ + }; + + static struct mv643xx_eth_platform_data rd88f6281_ge00_data = { +- .phy_addr = MV643XX_ETH_PHY_NONE, +- .speed = SPEED_1000, +- .duplex = DUPLEX_FULL, ++ .phy_addr = MV643XX_ETH_PHY_ADDR(11), + }; + + static struct dsa_chip_data rd88f6281_switch_chip_data = { +@@ -70,7 +93,7 @@ + static struct mvsdio_platform_data rd88f6281_mvsdio_data = { + .gpio_card_detect = 28, + }; +- ++#endif + static unsigned int rd88f6281_mpp_config[] __initdata = { + MPP28_GPIO, + 0 +@@ -91,6 +114,7 @@ + + kirkwood_ge00_init(rd88f6281_ge00_data); + kirkwood_pcie_id(dev, rev); ++#ifndef CONFIG_MACH_ICONNECT + if (rev == MV88F6281_REV_A0) { + rd88f6281_switch_chip_data.sw_addr = 10; + kirkwood_ge01_init(rd88f6281_ge01_data); +@@ -101,6 +125,7 @@ + + kirkwood_sata_init(rd88f6281_sata_data); + kirkwood_sdio_init(rd88f6281_mvsdio_data); ++#endif + kirkwood_uart0_init(); + } + +@@ -113,6 +138,18 @@ + } + subsys_initcall(rd88f6281_pci_init); + ++#ifdef CONFIG_MACH_ICONNECT ++MACHINE_START(RD88F6281, Iomega iConnect Wireless) ++ /* Maintainer: Saeed Bishara sa...@marvell.com */ ++ .phys_io= KIRKWOOD_REGS_PHYS_BASE, ++ .io_pg_offst= ((KIRKWOOD_REGS_VIRT_BASE) 18) 0xfffc, ++ .boot_params= 0x0100, ++ .init_machine = rd88f6281_init, ++ .map_io = kirkwood_map_io, ++ .init_irq = kirkwood_init_irq, ++ .timer = kirkwood_timer, ++MACHINE_END ++#else + MACHINE_START(RD88F6281, Marvell RD-88F6281 Reference Board) + /* Maintainer: Saeed Bishara sa...@marvell.com */ + .phys_io= KIRKWOOD_REGS_PHYS_BASE, +@@ -123,3 +160,4 @@ + .init_irq = kirkwood_init_irq, + .timer = kirkwood_timer, + MACHINE_END ++#endif +\ No newline at end of file Index: target/linux/kirkwood/config-default