Permalink
Browse files

Issue 20: Additonal packages for Buildroot ver. 2011.11

1. Changed name for the U-Boot first stage bootloader in configs from MLO to SPL;
2. Updated Linux kernel version to the 3.2.8;
3. Added patch for fixing invalid ISP CCDC pipeline in Linux kernel.
  • Loading branch information...
Max Galemin
Max Galemin committed Feb 29, 2012
1 parent abb047a commit d8555710c593d5d71907c79ed07ec2a20bd4f244
@@ -0,0 +1,26 @@
+From da42c102db1ae468001f39366f10653487ac7797 Mon Sep 17 00:00:00 2001
+From: Max Galemin <maksim.galemin@gmail.com>
+Date: Wed, 29 Feb 2012 21:52:18 +1100
+Subject: [PATCH] Fix invalid ISP CCDC pipeline
+
+1. Fixed invalid ISP CCDC device entity in ccdc_hs_vs_isr().
+---
+ drivers/media/video/omap3isp/ispccdc.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
+index 54a4a3f..8f377db 100644
+--- a/drivers/media/video/omap3isp/ispccdc.c
++++ b/drivers/media/video/omap3isp/ispccdc.c
+@@ -1407,7 +1407,7 @@ static int __ccdc_handle_stopping(struct isp_ccdc_device *ccdc, u32 event)
+ static void ccdc_hs_vs_isr(struct isp_ccdc_device *ccdc)
+ {
+ struct isp_pipeline *pipe =
+- to_isp_pipeline(&ccdc->video_out.video.entity);
++ to_isp_pipeline(&ccdc->subdev.entity);
+ struct video_device *vdev = ccdc->subdev.devnode;
+ struct v4l2_event event;
+
+--
+1.7.5.4
+
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.7 Kernel Configuration
+# Linux/arm 3.2.8 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
View
@@ -104,10 +104,10 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
endchoice
-config BR2_TARGET_UBOOT_MLO
- bool "Use U-Boot First Stage Bootloader (MLO)"
+config BR2_TARGET_UBOOT_SPL
+ bool "U-Boot SPL"
help
- Use U-Boot First Stage Bootloader (MLO)
+ U-Boot SPL is a First Stage Bootloader
menuconfig BR2_TARGET_UBOOT_UENV_PARAMETERS
bool "Custom uEnv Parameters"
View
@@ -33,8 +33,8 @@ else
UBOOT_BIN = u-boot.bin
endif
-ifeq ($(BR2_TARGET_UBOOT_MLO),y)
-UBOOT_MLO = MLO
+ifeq ($(BR2_TARGET_UBOOT_SPL),y)
+UBOOT_SPL = MLO
endif
ifeq ($(BR2_TARGET_UBOOT_UENV_PARAMETERS),y)
@@ -97,8 +97,8 @@ endef
define UBOOT_INSTALL_IMAGES_CMDS
cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
- if [ $(BR2_TARGET_UBOOT_MLO) = y ]; then \
- cp -dpf $(@D)/$(UBOOT_MLO) $(BINARIES_DIR)/; \
+ if [ $(BR2_TARGET_UBOOT_SPL) = y ]; then \
+ cp -dpf $(@D)/$(UBOOT_SPL) $(BINARIES_DIR)/; \
fi
if [ $(BR2_TARGET_UBOOT_UENV_PARAMETERS) = y ]; then \
echo "mpurate="$(BR2_TARGET_UBOOT_UENV_MPURATE) >> $(BINARIES_DIR)/$(UBOOT_UENV); \
@@ -13,9 +13,9 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="omap3_beagle"
BR2_TARGET_UBOOT_EXTRAVERSION="-mg01"
BR2_TARGET_UBOOT_FORMAT_IMG=y
-BR2_TARGET_UBOOT_MLO=y
+BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_UENV_PARAMETERS=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_PATCH="board/beagleboard/xm/kernel-patches/"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beagleboard/xm/linux-3.2.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beagleboard/xm/linux-3.2.8.config"
@@ -59,9 +59,9 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="omap3_beagle"
BR2_TARGET_UBOOT_EXTRAVERSION="-mg01"
BR2_TARGET_UBOOT_FORMAT_IMG=y
-BR2_TARGET_UBOOT_MLO=y
+BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_UENV_PARAMETERS=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_PATCH="board/beagleboard/xm/kernel-patches/"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beagleboard/xm/linux-3.2.7.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beagleboard/xm/linux-3.2.8.config"
View
@@ -22,7 +22,7 @@ choice
default BR2_LINUX_KERNEL_3_2
config BR2_LINUX_KERNEL_3_2
- bool "3.2.7"
+ bool "3.2.8"
config BR2_LINUX_KERNEL_3_1
bool "3.1.4"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
config BR2_LINUX_KERNEL_VERSION
string
- default "3.2.7" if BR2_LINUX_KERNEL_3_2
+ default "3.2.8" if BR2_LINUX_KERNEL_3_2
default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

0 comments on commit d855571

Please sign in to comment.