diff options
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/machine/include/omap3.inc | 2 | ||||
| -rw-r--r-- | recipes/linux/linux-omap-2.6.29/beagleboard/tincantools-puppy.diff | 66 | ||||
| -rw-r--r-- | recipes/linux/linux-omap_2.6.29.bb | 1 | ||||
| -rw-r--r-- | recipes/php/php-5.3.0/acinclude-xml2-config.patch | 18 | ||||
| -rw-r--r-- | recipes/php/php-5.3.0/pear-makefile.patch | 11 | ||||
| -rw-r--r-- | recipes/php/php-native_5.3.0.bb | 3 |
7 files changed, 104 insertions, 1 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 47055cf648..3f68a7440b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -19206,6 +19206,10 @@ sha256=5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3 md5=7380ffecebd95c6edb317ef861229ebd sha256=1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81 +[http://us2.php.net/distributions/php-5.3.0.tar.bz2] +md5=846760cd655c98dfd86d6d97c3d964b0 +sha256=83c9d86f830f8b188c70d3554d07b7416af90fd9e06d84340ffda58c09e58357 + [http://efault.net/npat/hacks/picocom/dist/picocom-1.3.tar.gz] md5=21865bf2891222082afc44afdd80aeaa sha256=ed3e0190a1940cf08a167429aa3fd25b3ae7313fdf126f851a9abccc89845ee6 diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 8e90453d4c..97327f0db7 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r37" +MACHINE_KERNEL_PR = "r38" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/tincantools-puppy.diff b/recipes/linux/linux-omap-2.6.29/beagleboard/tincantools-puppy.diff new file mode 100644 index 0000000000..c7856731e5 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/beagleboard/tincantools-puppy.diff @@ -0,0 +1,66 @@ +--- /tmp/board-omap3beagle.c 2009-07-01 01:06:44.000000000 +0200 ++++ git/arch/arm/mach-omap2/board-omap3beagle.c 2009-07-01 01:06:50.000000000 +0200 +@@ -125,6 +125,13 @@ + .wires = 8, + .gpio_wp = 29, + }, ++ { ++ .mmc = 2, ++ .wires = 4, ++ .gpio_wp = 141, ++ .gpio_cd = 162, ++ .transceiver = true, ++ }, + {} /* Terminator */ + }; + +@@ -132,6 +139,11 @@ + .supply = "vmmc", + }; + ++static struct regulator_consumer_supply beagle_vmmc2_supply = { ++ .supply = "vmmc", ++}; ++ ++ + static struct regulator_consumer_supply beagle_vsim_supply = { + .supply = "vmmc_aux", + }; +@@ -148,6 +160,7 @@ + + /* link regulators to MMC adapters */ + beagle_vmmc1_supply.dev = mmc[0].dev; ++ beagle_vmmc2_supply.dev = mmc[1].dev; + beagle_vsim_supply.dev = mmc[0].dev; + + /* REVISIT: need ehci-omap hooks for external VBUS +@@ -209,6 +222,21 @@ + .consumer_supplies = &beagle_vmmc1_supply, + }; + ++/* VMMC2 for MMC2 pins CMD, CLK, DAT0..DAT3 (max 100 mA) */ ++static struct regulator_init_data beagle_vmmc2 = { ++ .constraints = { ++ .min_uV = 2700000, ++ .max_uV = 3150000, ++ .valid_modes_mask = REGULATOR_MODE_NORMAL ++ | REGULATOR_MODE_STANDBY, ++ .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE ++ | REGULATOR_CHANGE_MODE ++ | REGULATOR_CHANGE_STATUS, ++ }, ++ .num_consumer_supplies = 1, ++ .consumer_supplies = &beagle_vmmc2_supply, ++}; ++ + /* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */ + static struct regulator_init_data beagle_vsim = { + .constraints = { +@@ -284,6 +312,7 @@ + .gpio = &beagle_gpio_data, + .power = &beagle_power_data, + .vmmc1 = &beagle_vmmc1, ++ .vmmc2 = &beagle_vmmc2, + .vsim = &beagle_vsim, + .vdac = &beagle_vdac, + .vpll2 = &beagle_vpll2, diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index 67a4803893..4193edaf8d 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -162,6 +162,7 @@ SRC_URI_append = " \ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ file://beagle-asoc.patch;patch=1 \ + file://tincantools-puppy.diff;patch=1 \ " SRC_URI_append_omap3evm = " \ diff --git a/recipes/php/php-5.3.0/acinclude-xml2-config.patch b/recipes/php/php-5.3.0/acinclude-xml2-config.patch new file mode 100644 index 0000000000..bf519d2934 --- /dev/null +++ b/recipes/php/php-5.3.0/acinclude-xml2-config.patch @@ -0,0 +1,18 @@ +--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 ++++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 +@@ -2359,12 +2359,9 @@ + AC_DEFUN([PHP_SETUP_LIBXML], [ + AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, + [ +- for i in $PHP_LIBXML_DIR /usr/local /usr; do +- if test -x "$i/bin/xml2-config"; then +- ac_cv_php_xml2_config_path="$i/bin/xml2-config" +- break +- fi +- done ++ ++ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" ++ + ]) + + if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/recipes/php/php-5.3.0/pear-makefile.patch b/recipes/php/php-5.3.0/pear-makefile.patch new file mode 100644 index 0000000000..26de98a48f --- /dev/null +++ b/recipes/php/php-5.3.0/pear-makefile.patch @@ -0,0 +1,11 @@ +--- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200 ++++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200 +@@ -6,7 +6,7 @@ + PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/recipes/php/php-native_5.3.0.bb b/recipes/php/php-native_5.3.0.bb new file mode 100644 index 0000000000..ac1c51fa3f --- /dev/null +++ b/recipes/php/php-native_5.3.0.bb @@ -0,0 +1,3 @@ +require php-native.inc + +PR = "r3" |